fix(ci): Proper Alpine version

opencodeco · Sep 16, 2024 · 8be2917 · 8be2917
1 parent 5cb16b3
commit 8be2917
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,11 +12,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - php: 81
+          - alpine: 3.19 
+            php: 81
             without-watchr: 1
-          - php: 82
+          - alpine: 3.20
+            php: 82
             without-watchr: ''
-          - php: 83
+          - alpine: 3.20
+            php: 83
             without-watchr: ''
     steps:
       -
@@ -41,6 +44,7 @@ jobs:
           context: .
           load: true
           build-args: |
+            ALPINE=${{ matrix.alpine }}
             PHP=${{ matrix.php }}
             WITHOUT_WATCHR=${{ matrix.without-watchr }}
           tags: opencodeco/phpctl:php${{ matrix.php }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ALPINE=3.19
+ARG ALPINE=3.20
 FROM alpine:${ALPINE}
 
 ARG PHP
@@ -11,7 +11,8 @@ ARG WITHOUT_WATCHR
 ENV WITHOUT_WATCHR=$WITHOUT_WATCHR
 
 COPY rootfs /
-RUN apk update && apk upgrade && apk add --no-cache \
+RUN sed -i 's/latest-stable/${ALPINE}/g' /etc/apk/repositories && \
+    apk update && apk upgrade && apk add --no-cache \
         git \
         docker-cli \
         php${PHP}-cli \