Merge pull request #32 from jdrouet/alpine-upgrade

upgrade alpine image to 3.14 and 3.15
rust-lang · Jan 20, 2022 · bae0446 · bae0446
2 parents 312f155 + ada4703
commit bae0446
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git 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.15
             tags: |
-              nightly-alpine3.12
+              nightly-alpine3.15
               nightly-alpine
+          - context: alpine
+            args: |
+              ALPINE_VERSION=3.14
+            tags: |
+              nightly-alpine3.14
           - 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 }}

diff --git a/alpine3.12/Dockerfile → alpine/Dockerfile b/alpine3.12/Dockerfile → 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 \