extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-07 08:44:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #783 from openziti/squash-dockerfiles

Browse Source 
reduce Docker image sizes
This commit is contained in:
Kenneth Bingham 2024-11-05 14:45:05 -05:00 committed by GitHub
commit 010e499c9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,6 +4,8 @@
FIX: Document unique names 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) FIX: Correct the download URL for the armv7 Linux release (https://github.com/openziti/zrok/issues/782)
## v0.4.44 ## v0.4.44

3
docker/compose/zrok-instance/zrok-controller.Dockerfile
View File

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

3
docker/compose/zrok-instance/zrok-frontend.Dockerfile
View File

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

1
docker/images/cross-build/Dockerfile
View File

@ -31,7 +31,6 @@ RUN wget -qO- https://deb.nodesource.com/setup_18.x | bash \
COPY --from=golang /usr/local/go /usr/local/go 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 COPY --from=goreleaser /usr/bin/goreleaser /usr/local/bin/goreleaser

6
docker/images/zrok/Dockerfile
View File

@ -24,14 +24,10 @@ RUN mkdir -p -m0755 /licenses
COPY ./LICENSE /licenses/apache.txt COPY ./LICENSE /licenses/apache.txt
RUN mkdir -p /usr/local/bin 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-enable.bash \
./nfpm/zrok-share.bash \ ./nfpm/zrok-share.bash \
/usr/local/bin/ /usr/local/bin/
RUN chmod 0755 \
/usr/local/bin/zrok \
/usr/local/bin/zrok-enable.bash \
/usr/local/bin/zrok-share.bash
USER ziggy USER ziggy
ENTRYPOINT [ "zrok" ] ENTRYPOINT [ "zrok" ]