Patches 2024-08-22 (5.x) (#286)

dpc-sdp · Aug 29, 2024 · 2e9a217 · 2e9a217
1 parent ca505c3
commit 2e9a217
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml
@@ -28,6 +28,12 @@ additional_build_steps:
     - ARG NODE_VERSION=v18.17.0
     - ARG NVM_DIR="/runner/.nvm"
     - ARG PHP_VERSION="8.2"
+    - ARG COMPOSER_VERSION="2.7.7"
+    - ARG HUB_VERSION="2.14.2"
+    - ARG GOJQ_VERSION="0.12.16"
+    - ARG HELM_VERSION="3.15.4"
+    - ARG YAMLFMT_VERSION="0.13.0"
+    - ARG KUBECTL_VERSION="1.31.0"
 
   append_final:
     - | # Required dependencies.
@@ -54,30 +60,30 @@ additional_build_steps:
       SHELL ["/bin/bash", "-c"]
       RUN set -eux; \
           arch_linux=$(uname -m) && arch_linux="${arch_linux/aarch64/arm64}" && arch_linux="${arch_linux/x86_64/amd64}"; \
-          curl -LO "https://dl.k8s.io/release/v1.25.12/bin/linux/${arch_linux}/kubectl"; \
+          curl -LO "https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/${arch_linux}/kubectl"; \
           chmod +x kubectl; \
           mv ./kubectl /usr/local/bin/kubectl;
 
     - RUN curl -L "https://github.com/uselagoon/lagoon-cli/releases/download/$LAGOON_CLI_VERSION/lagoon-cli-$LAGOON_CLI_VERSION-linux-amd64" -o /usr/local/bin/lagoon
     - RUN chmod +x /usr/local/bin/lagoon
-    - RUN curl -L "https://github.com/github/hub/releases/download/v2.14.2/hub-linux-amd64-2.14.2.tgz" -o /tmp/hub && tar -xvf /tmp/hub -C /tmp && mv /tmp/hub-linux-amd64-2.14.2/bin/hub /usr/local/bin
+    - RUN curl -L "https://github.com/github/hub/releases/download/v$HUB_VERSION/hub-linux-amd64-$HUB_VERSION.tgz" -o /tmp/hub && tar -xvf /tmp/hub -C /tmp && mv /tmp/hub-linux-amd64-$HUB_VERSION/bin/hub /usr/local/bin
     - RUN chmod +x /usr/local/bin/hub
     - RUN lagoon config feature --enable-local-dir-check false --force
-    - RUN curl -sS https://getcomposer.org/download/2.3.7/composer.phar --output composer.phar
+    - RUN curl -sS https://getcomposer.org/download/$COMPOSER_VERSION/composer.phar --output composer.phar
     - RUN chmod +x composer.phar
     - RUN mv composer.phar /usr/local/bin/composer
     - RUN composer global require szeidler/composer-patches-cli:^1.0
-    - RUN curl -L https://github.com/itchyny/gojq/releases/download/v0.12.4/gojq_v0.12.4_linux_amd64.tar.gz --output /tmp/gojq_v0.12.4_linux_amd64.tar.gz
-    - RUN tar -C /tmp -xvf /tmp/gojq_v0.12.4_linux_amd64.tar.gz
-    - RUN chmod +x /tmp/gojq_v0.12.4_linux_amd64/gojq
-    - RUN mv /tmp/gojq_v0.12.4_linux_amd64/gojq /usr/local/bin
+    - 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
+    - RUN tar -C /tmp -xvf /tmp/gojq_v$GOJQ_VERSION_linux_amd64.tar.gz
+    - RUN chmod +x /tmp/gojq_v$GOJQ_VERSION_linux_amd64/gojq
+    - RUN mv /tmp/gojq_v$GOJQ_VERSION_linux_amd64/gojq /usr/local/bin
     - RUN touch /runner/.bashrc && chmod +x /runner/.bashrc
     - RUN mkdir -p /runner/.nvm && chgrp 0 /runner/.nvm && chmod -R ug+rwx /runner/.nvm
     - RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_INSTALL_VERSION/install.sh | PROFILE="/runner/.bashrc" bash
-    - RUN curl -L "https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz" -o /tmp/helm && tar -xvf /tmp/helm -C /tmp && mv /tmp/linux-amd64/helm /usr/local/bin
+    - RUN curl -L "https://get.helm.sh/helm-v$HELM_VERSION-linux-amd64.tar.gz" -o /tmp/helm && tar -xvf /tmp/helm -C /tmp && mv /tmp/linux-amd64/helm /usr/local/bin
     - RUN chmod +x /usr/local/bin/helm
-    - RUN curl -L https://github.com/google/yamlfmt/releases/download/v0.12.1/yamlfmt_0.12.1_Linux_x86_64.tar.gz --output /tmp/yamlfmt_0.12.1_Linux_x86_64.tar.gz
-    - RUN tar -C /tmp -xvf /tmp/yamlfmt_0.12.1_Linux_x86_64.tar.gz
+    - RUN curl -L https://github.com/google/yamlfmt/releases/download/v$YAMLFMT_VERSION/yamlfmt_$YAMLFMT_VERSION_Linux_x86_64.tar.gz --output /tmp/yamlfmt_$YAMLFMT_VERSION_Linux_x86_64.tar.gz
+    - RUN tar -C /tmp -xvf /tmp/yamlfmt_$YAMLFMT_VERSION_Linux_x86_64.tar.gz
     - RUN chmod +x /tmp/yamlfmt
     - RUN mv /tmp/yamlfmt /usr/local/bin
     - | # Install GitHub gh cli tool

diff --git a/images/ci-builder/Dockerfile b/images/ci-builder/Dockerfile
@@ -1,7 +1,7 @@
 FROM hashicorp/terraform:latest AS terraform
 FROM php:8.2-cli-alpine
 ARG AHOY_VERSION=2.1.1
-ARG GOJQ_VERSION=0.12.4
+ARG GOJQ_VERSION=0.12.16
 ARG HUB_VERSION=2.14.2
 ARG LAGOON_CLI_VERSION=0.21.3
 

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:latest 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.2
 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