Skip to content

Commit 0d0c5d0

Browse files
authored
Merge pull request #2771 from polarathene/ci/docker-prefer-dist-local
ci: Docker - Prefer `dist-local` stage
2 parents 35457f9 + 0ab5e2d commit 0d0c5d0

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/docker-3.2.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
context: .
6060
file: Dockerfile.alpine
6161
platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le
62-
build-args: GIT_BRANCH
6362
cache-from: type=gha, scope=${{ github.workflow }}
6463
cache-to: type=gha, scope=${{ github.workflow }}
6564
labels: ${{ steps.docker_meta.outputs.labels }}

Dockerfile.alpine

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ CMD ["--help"]
1212
# Final image stage (add `testssl.sh` project files)
1313
# Choose either one as the final stage (defaults to last stage, `dist-git`)
1414

15-
# 27MB Image (Local repo copy from build context, uses `.dockerignore`):
16-
FROM base-alpine AS dist-local
17-
COPY --chown=testssl:testssl . /home/testssl/
18-
1915
# 35MB Image (Remote repo clone, cannot filter content through `.dockerignore`):
2016
FROM base-alpine AS dist-git
2117
ARG GIT_URL=https://github.com/testssl/testssl.sh.git
2218
ARG GIT_BRANCH
2319
ADD --chown=testssl:testssl ${GIT_URL}#${GIT_BRANCH?branch-required} /home/testssl
20+
21+
# 27MB Image (Local repo copy from build context, uses `.dockerignore`):
22+
FROM base-alpine AS dist-local
23+
COPY --chown=testssl:testssl . /home/testssl/

0 commit comments

Comments
 (0)