diff --git a/.github/workflows/docker-3.2.yml b/.github/workflows/docker-3.2.yml index 31b10f2..f921972 100644 --- a/.github/workflows/docker-3.2.yml +++ b/.github/workflows/docker-3.2.yml @@ -56,8 +56,6 @@ jobs: context: . file: Dockerfile.alpine 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-to: type=gha, scope=${{ github.workflow }} labels: ${{ steps.docker_meta.outputs.labels }} diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 3e353d8..82905f8 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -12,12 +12,12 @@ CMD ["--help"] # Final image stage (add `testssl.sh` project files) # 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`): FROM base-alpine AS dist-git ARG GIT_URL=https://github.com/testssl/testssl.sh.git ARG GIT_BRANCH 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/