From 87c6f7eef99d41574acfe3e7ca594b5001220930 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 15:38:42 +1100 Subject: [PATCH 1/9] Updated gojq --- images/awx-ee/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 38541d61..07f16ee8 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -30,7 +30,7 @@ additional_build_steps: - ARG PHP_VERSION="8.3" - ARG COMPOSER_VERSION="2.7.7" - ARG HUB_VERSION="2.14.2" - - ARG GOJQ_VERSION="0.12.16" + - ARG GOJQ_VERSION="0.12.17" - ARG HELM_VERSION="3.15.4" - ARG YAMLFMT_VERSION="0.13.0" - ARG KUBECTL_VERSION="1.31.0" From 9580ac252eb9b43de2c0ae46b18106451d2f29e0 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 15:39:59 +1100 Subject: [PATCH 2/9] Updated helm --- images/awx-ee/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 07f16ee8..5c0eb2cf 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -31,7 +31,7 @@ additional_build_steps: - ARG COMPOSER_VERSION="2.7.7" - ARG HUB_VERSION="2.14.2" - ARG GOJQ_VERSION="0.12.17" - - ARG HELM_VERSION="3.15.4" + - ARG HELM_VERSION="3.16.3" - ARG YAMLFMT_VERSION="0.13.0" - ARG KUBECTL_VERSION="1.31.0" From 3ebe58ec2e1df83debe9bbb76a8d61937af0c03e Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 15:45:52 +1100 Subject: [PATCH 3/9] Updated kubectl --- images/awx-ee/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 5c0eb2cf..2c0d45e9 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -33,7 +33,7 @@ additional_build_steps: - ARG GOJQ_VERSION="0.12.17" - ARG HELM_VERSION="3.16.3" - ARG YAMLFMT_VERSION="0.13.0" - - ARG KUBECTL_VERSION="1.31.0" + - ARG KUBECTL_VERSION="1.32.0" append_final: - | # Required dependencies. From 1061fdb0e277d68887766979be21af63639efac6 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 15:47:41 +1100 Subject: [PATCH 4/9] Updated lagoon cli --- images/awx-ee/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 2c0d45e9..7a0ca057 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -23,7 +23,7 @@ additional_build_steps: - LABEL org.opencontainers.image.title="SDP AWX Execution Environment image." - LABEL org.opencontainers.image.description="Provides an AWX execution environment image optimised for use with SDP. Built with ansible-builder." - LABEL org.opencontainers.image.source="https://github.com/dpc-sdp/bay/blob/6.x/images/awx-ee/" - - ARG LAGOON_CLI_VERSION=v0.21.3 + - ARG LAGOON_CLI_VERSION=v0.31.2 - ARG NVM_INSTALL_VERSION=v0.39.7 - ARG NODE_VERSION=v20.9.0 - ARG NVM_DIR="/runner/.nvm" From aa506f8a8f3f92e21d97ce50209865617775c426 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 15:48:20 +1100 Subject: [PATCH 5/9] Updated yamlfmt --- images/awx-ee/execution-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml index 7a0ca057..207200d6 100644 --- a/images/awx-ee/execution-environment.yml +++ b/images/awx-ee/execution-environment.yml @@ -32,7 +32,7 @@ additional_build_steps: - ARG HUB_VERSION="2.14.2" - ARG GOJQ_VERSION="0.12.17" - ARG HELM_VERSION="3.16.3" - - ARG YAMLFMT_VERSION="0.13.0" + - ARG YAMLFMT_VERSION="0.14.0" - ARG KUBECTL_VERSION="1.32.0" append_final: From 7e9e036acbf440f3c0d5091b4918d5006608ad0e Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 15:49:18 +1100 Subject: [PATCH 6/9] Updated elasticsearch --- images/elasticsearch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/elasticsearch/Dockerfile b/images/elasticsearch/Dockerfile index c434b4f3..b15b586e 100644 --- a/images/elasticsearch/Dockerfile +++ b/images/elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM elasticsearch:8.10.2 +FROM elasticsearch:8.16.1 ENV ES_PATH=/usr/share/elasticsearch From 1d29205c3e253ff8f2841dee8bce6db6a01cb42f Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 16:01:17 +1100 Subject: [PATCH 7/9] Updated mailpit --- images/mailpit/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/mailpit/Dockerfile b/images/mailpit/Dockerfile index 9830ab87..533fbdda 100644 --- a/images/mailpit/Dockerfile +++ b/images/mailpit/Dockerfile @@ -3,7 +3,7 @@ # FROM alpine:latest -ARG MAILPIT_VERSION=1.20.2 +ARG MAILPIT_VERSION=1.21.6 # Install ca-certificates, required for the "release message" feature: RUN apk --no-cache add \ From f644f7bf47dd1b1d6e46f9e84cc23211b9b10f04 Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 16:11:44 +1100 Subject: [PATCH 8/9] Updated gojq --- images/ci-builder/Dockerfile | 2 +- images/php/Dockerfile.cli | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/ci-builder/Dockerfile b/images/ci-builder/Dockerfile index 85651735..4552137f 100644 --- a/images/ci-builder/Dockerfile +++ b/images/ci-builder/Dockerfile @@ -1,7 +1,7 @@ FROM hashicorp/terraform:latest AS terraform FROM php:8.3-cli-alpine ARG AHOY_VERSION=2.2.0 -ARG GOJQ_VERSION=0.12.16 +ARG GOJQ_VERSION=0.12.17 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 index 22507c99..91e91d62 100644 --- a/images/php/Dockerfile.cli +++ b/images/php/Dockerfile.cli @@ -6,7 +6,7 @@ FROM uselagoon/php-${PHP_VERSION}-cli-drupal:latest # Remove unnecessary packages that increase our attack surface area. RUN apk del postgresql-client -ARG GOJQ_VERSION=0.12.16 +ARG GOJQ_VERSION=0.12.17 ARG DOCKERIZE_VERSION=v0.8.0 ARG BAY_CLI_VERSION=v1.2.0 From d985441baccb2540b9b975f07fe6fb8bd8afc3ee Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Thu, 12 Dec 2024 16:25:31 +1100 Subject: [PATCH 9/9] Updated lagoon cli --- images/ci-builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ci-builder/Dockerfile b/images/ci-builder/Dockerfile index 4552137f..8edeae89 100644 --- a/images/ci-builder/Dockerfile +++ b/images/ci-builder/Dockerfile @@ -3,7 +3,7 @@ FROM php:8.3-cli-alpine ARG AHOY_VERSION=2.2.0 ARG GOJQ_VERSION=0.12.17 ARG HUB_VERSION=2.14.2 -ARG LAGOON_CLI_VERSION=0.21.3 +ARG LAGOON_CLI_VERSION=0.31.2 # Ensure temp files dont end up in image. VOLUME /tmp