Merge remote-tracking branch 'origin/2024.11'

tine-groupware · Feb 5, 2024 · a73a3ef · a73a3ef
2 parents 52669f0 + 9afc205
commit a73a3ef
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/ci/dockerimage/test.Dockerfile b/ci/dockerimage/test.Dockerfile
@@ -12,8 +12,23 @@ ARG BASE_IMAGE=base
 #  -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -    -
 FROM ${BASE_IMAGE} as test
 
-RUN apk add mysql-client jq rsync coreutils
-
+RUN apk add mysql-client jq rsync coreutils git build-base
+RUN if [ "${ALPINE_PHP_PACKAGE}" == "php81" ] || [ "${ALPINE_PHP_PACKAGE}" == "php82" ]; then \
+        EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"; \
+        php -r "copy('https://getcomposer.org/installer', '/composer-setup.php');"; \
+        ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', '/composer-setup.php');")"; \
+        if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then \
+            >&2 echo 'ERROR: Invalid installer checksum'; \
+            rm /composer-setup.php; \
+            exit 1; \
+        fi; \
+        php /composer-setup.php --install-dir=/usr/bin --filename=composer; \
+        RESULT=$?; \
+        rm /composer-setup.php; \
+        exit $RESULT; \
+    else \
+      apk add --no-cache composer; \
+    fi
 COPY etc /config
 COPY phpstan.neon ${TINE20ROOT}/phpstan.neon
 COPY phpstan-baseline.neon ${TINE20ROOT}/phpstan-baseline.neon