Merge pull request #2771 from polarathene/ci/docker-prefer-dist-local

ci: Docker - Prefer `dist-local` stage
This commit is contained in:
Dirk Wetter
2025-05-18 16:24:43 +02:00
committed by GitHub
2 changed files with 4 additions and 5 deletions

View File

@ -59,7 +59,6 @@ jobs:
context: . context: .
file: Dockerfile.alpine file: Dockerfile.alpine
platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le
build-args: GIT_BRANCH
cache-from: type=gha, scope=${{ github.workflow }} cache-from: type=gha, scope=${{ github.workflow }}
cache-to: type=gha, scope=${{ github.workflow }} cache-to: type=gha, scope=${{ github.workflow }}
labels: ${{ steps.docker_meta.outputs.labels }} labels: ${{ steps.docker_meta.outputs.labels }}

View File

@ -12,12 +12,12 @@ CMD ["--help"]
# Final image stage (add `testssl.sh` project files) # Final image stage (add `testssl.sh` project files)
# Choose either one as the final stage (defaults to last stage, `dist-git`) # Choose either one as the final stage (defaults to last stage, `dist-git`)
# 27MB Image (Local repo copy from build context, uses `.dockerignore`):
FROM base-alpine AS dist-local
COPY --chown=testssl:testssl . /home/testssl/
# 35MB Image (Remote repo clone, cannot filter content through `.dockerignore`): # 35MB Image (Remote repo clone, cannot filter content through `.dockerignore`):
FROM base-alpine AS dist-git FROM base-alpine AS dist-git
ARG GIT_URL=https://github.com/testssl/testssl.sh.git ARG GIT_URL=https://github.com/testssl/testssl.sh.git
ARG GIT_BRANCH ARG GIT_BRANCH
ADD --chown=testssl:testssl ${GIT_URL}#${GIT_BRANCH?branch-required} /home/testssl ADD --chown=testssl:testssl ${GIT_URL}#${GIT_BRANCH?branch-required} /home/testssl
# 27MB Image (Local repo copy from build context, uses `.dockerignore`):
FROM base-alpine AS dist-local
COPY --chown=testssl:testssl . /home/testssl/