Merge pull request #783 from openziti/squash-dockerfiles

reduce Docker image sizes

.github/dependabot.yml

@@ -12,4 +12,4 @@ updates:
         update-types:
           - "major"
           - "minor"
-          - "patch"
+          - "patch"

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 FIX: Document unique names
 
+FIX: reduce Docker image sizes (https://github.com/openziti/zrok/pull/783)
+
 FIX: Correct the download URL for the armv7 Linux release (https://github.com/openziti/zrok/issues/782)
 
 ## v0.4.44

docker/compose/zrok-instance/zrok-controller.Dockerfile

@@ -18,8 +18,7 @@ ARG ZITI_CTRL_ADVERTISED_PORT
 ARG ZITI_PWD
 
 # render zrok controller config.yml
-COPY ./envsubst.bash ./bootstrap-controller.bash /usr/local/bin/
-RUN chmod 0755 /usr/local/bin/envsubst.bash /usr/local/bin/bootstrap-controller.bash
+COPY --chmod=0755 ./envsubst.bash ./bootstrap-controller.bash /usr/local/bin/
 COPY ./zrok-controller-config.yml.envsubst /tmp/
 RUN mkdir -p /etc/zrok-controller/
 RUN envsubst.bash \

docker/compose/zrok-instance/zrok-frontend.Dockerfile

@@ -21,8 +21,7 @@ ARG ZROK_OAUTH_GITHUB_CLIENT_ID
 ARG ZROK_OAUTH_GITHUB_CLIENT_SECRET
 
 # render zrok frontend config.yml
-COPY ./envsubst.bash ./bootstrap-frontend.bash /usr/local/bin/
-RUN chmod 0755 /usr/local/bin/envsubst.bash /usr/local/bin/bootstrap-frontend.bash
+COPY --chmod=0755 ./envsubst.bash ./bootstrap-frontend.bash /usr/local/bin/
 COPY ./zrok-frontend-config.yml.envsubst /tmp/
 RUN mkdir -p /etc/zrok-frontend/
 RUN envsubst.bash \

docker/images/cross-build/Dockerfile

@@ -31,7 +31,6 @@ RUN wget -qO- https://deb.nodesource.com/setup_18.x | bash \
 
 
 COPY --from=golang /usr/local/go /usr/local/go
-# RUN chmod -R go+rX ${go_path} ${go_cache}
 
 COPY --from=goreleaser /usr/bin/goreleaser /usr/local/bin/goreleaser
 

docker/images/zrok/Dockerfile

@@ -24,14 +24,10 @@ RUN mkdir -p -m0755 /licenses
 COPY ./LICENSE /licenses/apache.txt
 
 RUN mkdir -p /usr/local/bin
-COPY ${ARTIFACTS_DIR}/${TARGETARCH}/${TARGETOS}/zrok \
+COPY --chmod=0755 ${ARTIFACTS_DIR}/${TARGETARCH}/${TARGETOS}/zrok \
       ./nfpm/zrok-enable.bash \
       ./nfpm/zrok-share.bash \
       /usr/local/bin/
-RUN chmod 0755 \
-      /usr/local/bin/zrok \
-      /usr/local/bin/zrok-enable.bash \
-      /usr/local/bin/zrok-share.bash
 
 USER ziggy
 ENTRYPOINT [ "zrok" ]