Merge pull request #32 from City-of-Helsinki/UHF-X-updates

Update to alpine 3.20
City-of-Helsinki · Jul 1, 2024 · f015ff5 · f015ff5
2 parents 0e1f81f + c68a9d8
commit f015ff5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/local/drupal/Dockerfile b/local/drupal/Dockerfile
@@ -6,6 +6,8 @@ COPY --from=ghcr.io/city-of-helsinki/drupal-oc-cli:latest /usr/bin/oc /usr/bin/o
 
 RUN sudo apk add --no-cache jq
 
+RUN sudo composer self-update
+
 # Autostart drush server and syslog services.
 COPY entrypoints/ /entrypoints
 

diff --git a/openshift/drupal/docker-bake.hcl b/openshift/drupal/docker-bake.hcl
@@ -16,7 +16,7 @@ group "prod" {
 target "php" {
   target = "final"
   args = {
-    ALPINE_VERSION = "3.19"
+    ALPINE_VERSION = "3.20"
   }
 }
 
@@ -25,7 +25,7 @@ target "php83-dev" {
   args = {
     PHP_VERSION = "8.3"
     PHP_SHORT_VERSION = "83"
-    ALPINE_VERSION = "3.19"
+    ALPINE_VERSION = "3.20"
   }
   tags = ["${REPO_BASE}:8.3-dev"]
   platforms = ["linux/amd64"]
@@ -36,7 +36,7 @@ target "php83" {
   args = {
     PHP_VERSION = "8.3"
     PHP_SHORT_VERSION = "83"
-    ALPINE_VERSION = "3.19"
+    ALPINE_VERSION = "3.20"
   }
   tags = ["${REPO_BASE}:8.3"]
   platforms = ["linux/amd64"]
@@ -47,7 +47,7 @@ target "php82-dev" {
   args = {
     PHP_VERSION = "8.2"
     PHP_SHORT_VERSION = "82"
-    ALPINE_VERSION = "3.19"
+    ALPINE_VERSION = "3.20"
   }
   tags = ["${REPO_BASE}:8.2-dev"]
   platforms = ["linux/amd64"]
@@ -58,7 +58,7 @@ target "php82" {
   args = {
     PHP_VERSION = "8.2"
     PHP_SHORT_VERSION = "82"
-    ALPINE_VERSION = "3.19"
+    ALPINE_VERSION = "3.20"
   }
   tags = ["${REPO_BASE}:8.2"]
   platforms = ["linux/amd64"]

diff --git a/openshift/drupal/tests/php82.yaml b/openshift/drupal/tests/php82.yaml
@@ -13,4 +13,4 @@ commandTests:
   - name: 'Alpine version'
     command: cat
     args: ['/etc/alpine-release']
-    expectedOutput: ['3.19.*']
+    expectedOutput: ['3.20.*']
diff --git a/openshift/drupal/tests/php83.yaml b/openshift/drupal/tests/php83.yaml
@@ -14,4 +14,4 @@ commandTests:
   - name: 'Alpine version'
     command: cat
     args: ['/etc/alpine-release']
-    expectedOutput: ['3.19.*']
+    expectedOutput: ['3.20.*']