Patched php images

dpc-sdp · Aug 22, 2024 · 97e9b13 · 97e9b13
1 parent a870f04
commit 97e9b13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/images/php/Dockerfile.cli b/images/php/Dockerfile.cli
@@ -3,26 +3,27 @@ FROM php:${PHP_VERSION}-cli-alpine AS php-cli
 FROM ghcr.io/skpr/mtk:v2.0.2 AS mtk
 FROM uselagoon/php-${PHP_VERSION}-cli-drupal:latest
 
+ARG GOJQ_VERSION=0.12.16
+ARG DOCKERIZE_VERSION=v0.8.0
+ARG BAY_CLI_VERSION=v1.1.2
+
 COPY --from=php-cli /usr/local/bin/phpdbg /usr/local/bin/
 ENV WEBROOT=docroot
 ENV COMPOSER_CACHE_DIR=/tmp/.composer/cache
 
 # Install gojq.
-ARG GOJQ_VERSION=0.12.4
 RUN curl -L https://github.com/itchyny/gojq/releases/download/v${GOJQ_VERSION}/gojq_v${GOJQ_VERSION}_linux_amd64.tar.gz --output /tmp/gojq_v${GOJQ_VERSION}_linux_amd64.tar.gz && \
     tar -C /tmp -xvf /tmp/gojq_v${GOJQ_VERSION}_linux_amd64.tar.gz && \
     chmod +x /tmp/gojq_v${GOJQ_VERSION}_linux_amd64/gojq && \
     mv /tmp/gojq_v${GOJQ_VERSION}_linux_amd64/gojq /usr/local/bin
 
-ARG DOCKERIZE_VERSION=v0.6.1
 RUN wget -O /usr/local/bin/dockerize https://github.com/dpc-sdp/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize_amd64_linux && \
     chmod +x /usr/local/bin/dockerize
 
 # Install redis-cli for debugging.
 RUN apk add redis --no-cache
 
 # Install bay-cli.
-ARG BAY_CLI_VERSION=v1.1.2
 RUN curl -L "https://github.com/dpc-sdp/bay-cli/releases/download/${BAY_CLI_VERSION}/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz" --output /tmp/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz
 RUN tar -C /tmp -xvf /tmp/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz
 RUN chmod +x /tmp/bay

diff --git a/images/php/Dockerfile.fpm b/images/php/Dockerfile.fpm
@@ -1,6 +1,8 @@
 ARG PHP_VERSION=8.3
 FROM uselagoon/php-${PHP_VERSION}-fpm:latest
 
+ARG BAY_CLI_VERSION=v1.1.2
+
 RUN mkdir /bay
 COPY 01-bay.ini /usr/local/etc/php/conf.d/
 COPY bay-php-config.sh /bay
@@ -24,7 +26,6 @@ RUN  apk add --no-cache tzdata \
     && echo $TZ > /etc/timezone
 
 # Install bay-cli.
-ARG BAY_CLI_VERSION=v1.1.2
 RUN curl -L "https://github.com/dpc-sdp/bay-cli/releases/download/${BAY_CLI_VERSION}/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz" --output /tmp/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz
 RUN tar -C /tmp -xvf /tmp/bay_$(echo ${TARGETPLATFORM:-linux/amd64} | tr '/' '_').tar.gz
 RUN chmod +x /tmp/bay