From e3b61868a1da60b3db2a01d741492ddb58c21220 Mon Sep 17 00:00:00 2001 From: Kegelcizer Date: Fri, 28 Jun 2024 11:23:35 +0300 Subject: [PATCH] Update Dockerfile Created folders and set permissions at build stage. Install stuff and copy only required folders with permissions already set at build stage. --- docker/Dockerfile | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5a5022a..8d6ed44 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,5 @@ FROM docker.io/golang:alpine AS build -RUN apk add --no-cache bash netcat-openbsd sudo - RUN mkdir -p /opt/zoraxy/source/ &&\ mkdir -p /opt/zoraxy/config/ &&\ mkdir -p /usr/local/bin/ @@ -17,23 +15,18 @@ RUN go mod tidy &&\ go build -o /usr/local/bin/zoraxy &&\ rm -r /opt/zoraxy/source/ +RUN chmod 755 /usr/local/bin/zoraxy &&\ + chmod +x /usr/local/bin/zoraxy + FROM docker.io/alpine:3.20 RUN apk add --no-cache bash netcat-openbsd sudo -RUN mkdir -p /opt/zoraxy/source/ &&\ - mkdir -p /opt/zoraxy/config/ &&\ - mkdir -p /usr/local/bin/ +COPY --from=build /usr/local/bin/zoraxy /usr/local/bin/zoraxy +COPY --from=build /opt/zoraxy/config/ /opt/zoraxy/config VOLUME [ "/opt/zoraxy/config/" ] -RUN chmod -R 770 /opt/zoraxy/ - -COPY --from=build /usr/local/bin/zoraxy /usr/local/bin/zoraxy - -RUN chmod 755 /usr/local/bin/zoraxy &&\ - chmod +x /usr/local/bin/zoraxy - WORKDIR /opt/zoraxy/config/ ENV AUTORENEW="86400" @@ -52,4 +45,4 @@ ENV ZTPORT="9993" ENTRYPOINT "zoraxy" "-docker=true" "-autorenew=${AUTORENEW}" "-fastgeoip=${FASTGEOIP}" "-log=${LOG}" "-mdns=${MDNS}" "-mdnsname=${MDNSNAME}" "-noauth=${NOAUTH}" "-port=:${PORT}" "-sshlb=${SSHLB}" "-version=${VERSION}" "-webfm=${WEBFM}" "-webroot=${WEBROOT}" "-ztauth=${ZTAUTH}" "-ztport=${ZTPORT}" -HEALTHCHECK --interval=15s --timeout=5s --start-period=10s --retries=3 CMD nc -vz 127.0.0.1 $PORT || exit 1 \ No newline at end of file +HEALTHCHECK --interval=15s --timeout=5s --start-period=10s --retries=3 CMD nc -vz 127.0.0.1 $PORT || exit 1