From 8f2aa32669daae81794b2a90b12afdf578420ea9 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Fri, 1 Nov 2024 19:00:24 -0400
Subject: [PATCH] reduce Docker image sizes

---
 .github/dependabot.yml                                  | 2 +-
 CHANGELOG.md                                            | 2 ++
 docker/compose/zrok-instance/zrok-controller.Dockerfile | 3 +--
 docker/compose/zrok-instance/zrok-frontend.Dockerfile   | 3 +--
 docker/images/cross-build/Dockerfile                    | 1 -
 docker/images/zrok/Dockerfile                           | 6 +-----
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 88d14836..7e4e8d7f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,4 +12,4 @@ updates:
         update-types:
           - "major"
           - "minor"
-          - "patch"
\ No newline at end of file
+          - "patch"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 756a473d..2c3d9049 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 FIX: Document unique names
 
+FIX: reduce Docker image sizes (https://github.com/openziti/zrok/pull/783)
+
 ## v0.4.44
 
 FIX: Fix for goreleaser build action to align with changed ARM64 build path.
diff --git a/docker/compose/zrok-instance/zrok-controller.Dockerfile b/docker/compose/zrok-instance/zrok-controller.Dockerfile
index 6f00f934..8ff1c83d 100644
--- a/docker/compose/zrok-instance/zrok-controller.Dockerfile
+++ b/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 \
diff --git a/docker/compose/zrok-instance/zrok-frontend.Dockerfile b/docker/compose/zrok-instance/zrok-frontend.Dockerfile
index c46794a3..6fa48b90 100644
--- a/docker/compose/zrok-instance/zrok-frontend.Dockerfile
+++ b/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 \
diff --git a/docker/images/cross-build/Dockerfile b/docker/images/cross-build/Dockerfile
index a8402f6f..3356d357 100644
--- a/docker/images/cross-build/Dockerfile
+++ b/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
 
diff --git a/docker/images/zrok/Dockerfile b/docker/images/zrok/Dockerfile
index 8c202e76..5f378135 100644
--- a/docker/images/zrok/Dockerfile
+++ b/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" ]