build: remove Makefile and update Docker build steps (#6980)

1 files changed, 5 insertions, 13 deletions

diff --git a/Dockerfile b/Dockerfile
index 094b187b..a0f7ad44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,20 +7,12 @@ RUN apk --no-cache --no-progress add --virtual \
 
 WORKDIR /gogs.io/gogs
 COPY . .
-RUN make build TAGS="cert pam"
+
+RUN ./docker/build/install-task.sh
+RUN TAGS="cert pam" task build
 
 FROM alpine:3.14
-RUN if [ `uname -m` == "aarch64" ] ; then \
-      export arch="arm64" ; \
-  elif [ `uname -m` == "armv7l" ] ; then \
-      export arch="armhf"; \
-  else \
-      export arch="amd64" ; \
-  fi \
-  && wget https://github.com/tianon/gosu/releases/download/1.11/gosu-$arch -O /usr/sbin/gosu \
-  && chmod +x /usr/sbin/gosu \
-  && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \
-  && apk --no-cache --no-progress add \
+RUN apk --no-cache --no-progress add \
   bash \
   ca-certificates \
   curl \
@@ -42,7 +34,7 @@ WORKDIR /app/gogs
 COPY docker ./docker
 COPY --from=binarybuilder /gogs.io/gogs/gogs .
 
-RUN ./docker/finalize.sh
+RUN ./docker/build/finalize.sh
 
 # Configure Docker Container
 VOLUME ["/data", "/backup"]