From 31a3940f1c8fd85f1014f17924499f3b0699044a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Drouet?= Date: Mon, 3 Jan 2022 13:42:25 +0100 Subject: [PATCH 1/4] refactor alpine dockerfile to allow multiple version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Drouet --- {alpine3.12 => alpine}/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename {alpine3.12 => alpine}/Dockerfile (83%) diff --git a/alpine3.12/Dockerfile b/alpine/Dockerfile similarity index 83% rename from alpine3.12/Dockerfile rename to alpine/Dockerfile index f9a32f7..645d54c 100644 --- a/alpine3.12/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,7 @@ -FROM alpine:3.12 +# to specify a different alpine version, use --build-arg ALPINE_VERSION=3.12 +# when building the image +ARG ALPINE_VERSION=3.14 +FROM alpine:${ALPINE_VERSION} RUN apk add --no-cache \ ca-certificates \ From 7d80f27a58e7fcdc878725391bd916a401f9b4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Drouet?= Date: Mon, 3 Jan 2022 13:49:05 +0100 Subject: [PATCH 2/4] update docker action workflow to handle build args MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Drouet --- .github/workflows/build.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c15184b..5b0b016 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,17 @@ jobs: strategy: matrix: include: - - context: alpine3.12 + - context: alpine + args: | + ALPINE_VERSION=3.14 tags: | - nightly-alpine3.12 + nightly-alpine3.14 nightly-alpine + - context: alpine + args: | + ALPINE_VERSION=3.12 + tags: | + nightly-alpine3.12 - context: bullseye tags: | nightly-bullseye @@ -66,6 +73,7 @@ jobs: - uses: docker/build-push-action@v2 with: context: ${{ matrix.context }} + build-args: ${{ matrix.args }} platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} From 67a91511df192e7596836fccb3a506b2949db4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Drouet?= Date: Wed, 12 Jan 2022 14:13:06 +0100 Subject: [PATCH 3/4] remove 3.12 and add 3.13 and 3.15 versions of alpine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Drouet --- .github/workflows/build.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b0b016..39b73f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,17 +15,22 @@ jobs: strategy: matrix: include: + - context: alpine + args: | + ALPINE_VERSION=3.15 + tags: | + nightly-alpine3.15 + nightly-alpine - context: alpine args: | ALPINE_VERSION=3.14 tags: | nightly-alpine3.14 - nightly-alpine - context: alpine args: | - ALPINE_VERSION=3.12 + ALPINE_VERSION=3.13 tags: | - nightly-alpine3.12 + nightly-alpine3.13 - context: bullseye tags: | nightly-bullseye From ada470343f047793bb8fc4a420cda916ff11e78b Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 19 Jan 2022 21:35:54 -0500 Subject: [PATCH 4/4] Update .github/workflows/build.yml --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39b73f3..554130c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,11 +26,6 @@ jobs: ALPINE_VERSION=3.14 tags: | nightly-alpine3.14 - - context: alpine - args: | - ALPINE_VERSION=3.13 - tags: | - nightly-alpine3.13 - context: bullseye tags: | nightly-bullseye