diff options
| author | Jonas Zohren <git-pbkyr@jzohren.de> | 2022-03-18 17:52:50 +0000 |
|---|---|---|
| committer | Jonas Zohren <git-pbkyr@jzohren.de> | 2022-03-18 17:52:50 +0000 |
| commit | a2a7c6187228bbcbbefadaa703e5afe469b7cbfe (patch) | |
| tree | 7a3fe1a3942d0685fd32a48371b9cf3cb2da4e7c | |
| parent | 6be5e83e61fac5a2037d5fef5e38020c5c7f864c (diff) | |
| parent | 61277452af96aa2c9a50bbd0ea206d1856b53918 (diff) | |
| download | conduit-a2a7c6187228bbcbbefadaa703e5afe469b7cbfe.zip | |
Merge branch 'docker-bump-alpine-version' into 'next'
chore(docker): Bump alpine (base image) version
Closes #255
See merge request famedly/conduit!330
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | docker/ci-binaries-packaging.Dockerfile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf68e25..380332b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -316,9 +316,10 @@ test:sytest: test:dockerlint: stage: "test" needs: [] - image: "ghcr.io/hadolint/hadolint:latest-alpine" + image: "ghcr.io/hadolint/hadolint@sha256:6c4b7c23f96339489dd35f21a711996d7ce63047467a9a562287748a03ad5242" # 2.8.0-alpine interruptible: true script: + - hadolint --version # First pass: Print for CI log: - > hadolint diff --git a/docker/ci-binaries-packaging.Dockerfile b/docker/ci-binaries-packaging.Dockerfile index 6defc3d..1a31871 100644 --- a/docker/ci-binaries-packaging.Dockerfile +++ b/docker/ci-binaries-packaging.Dockerfile @@ -7,7 +7,7 @@ # Credit's for the original Dockerfile: Weasy666. # --------------------------------------------------------------------------------------------------------- -FROM docker.io/alpine:3.15.0 AS runner +FROM docker.io/alpine:3.15.1 AS runner # Standard port on which Conduit launches. |