yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12728 from id/0318-optimize-docker-image-layers 

build(docker): optimize docker image layers
This commit is contained in:
Ivan Dyachkov 2024-03-19 07:53:02 +01:00 committed by GitHub
parent 8227e567a1 255d9e7d1e
commit 0ce56fc397
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build_and_push_docker_images.yaml vendored
View File

@ -204,6 +204,7 @@ jobs:
docker exec -t -u root $CID node_dump docker exec -t -u root $CID node_dump
docker rm -f $CID docker rm -f $CID
- name: Push docker image - name: Push docker image
if: inputs.publish || github.repository_owner != 'emqx'
env: env:
PROFILE: ${{ matrix.profile[0] }} PROFILE: ${{ matrix.profile[0] }}
DOCKER_REGISTRY: ${{ matrix.profile[1] }} DOCKER_REGISTRY: ${{ matrix.profile[1] }}

13
deploy/docker/Dockerfile
View File

@ -49,19 +49,18 @@ ENV LANG=C.UTF-8
COPY deploy/docker/docker-entrypoint.sh /usr/bin/ COPY deploy/docker/docker-entrypoint.sh /usr/bin/
COPY --from=builder /emqx-rel /opt/ COPY --from=builder /emqx-rel /opt/
WORKDIR /opt/emqx
RUN set -eu; \ RUN set -eu; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends ca-certificates procps $(echo "${EXTRA_DEPS}" | tr ',' ' '); \ apt-get install -y --no-install-recommends ca-certificates procps $(echo "${EXTRA_DEPS}" | tr ',' ' '); \
rm -rf /var/lib/apt/lists/*; \
find /opt/emqx -name 'swagger*.js.map' -exec rm {} +; \ find /opt/emqx -name 'swagger*.js.map' -exec rm {} +; \
ln -s /opt/emqx/bin/* /usr/local/bin/; \
groupadd -r -g 1000 emqx; \ groupadd -r -g 1000 emqx; \
useradd -r -m -u 1000 -g emqx emqx; \ useradd -r -m -u 1000 -g emqx emqx; \
chgrp -Rf emqx /opt/emqx; \ mkdir -p /opt/emqx/log /opt/emqx/data /opt/emqx/plugins; \
chmod -Rf g+w /opt/emqx; \ chown -R emqx:emqx /opt/emqx/log /opt/emqx/data /opt/emqx/plugins
chown -Rf emqx /opt/emqx; \
ln -s /opt/emqx/bin/* /usr/local/bin/; \ WORKDIR /opt/emqx
rm -rf /var/lib/apt/lists/*
USER emqx USER emqx