From c83de838d19e0252afb2d756df15e40b630a3a6b Mon Sep 17 00:00:00 2001
From: Nick Santamaria <nicholas.santamaria@dpc.vic.gov.au>
Date: Thu, 12 Dec 2024 16:29:53 +1100
Subject: [PATCH] Patched various packages (#339)

---
 images/awx-ee/execution-environment.yml | 10 +++++-----
 images/ci-builder/Dockerfile            |  4 ++--
 images/elasticsearch/Dockerfile         |  2 +-
 images/mailpit/Dockerfile               |  2 +-
 images/php/Dockerfile.cli               |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/images/awx-ee/execution-environment.yml b/images/awx-ee/execution-environment.yml
index 38541d61..207200d6 100644
--- a/images/awx-ee/execution-environment.yml
+++ b/images/awx-ee/execution-environment.yml
@@ -23,17 +23,17 @@ 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"
     - ARG PHP_VERSION="8.3"
     - 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"
+    - ARG GOJQ_VERSION="0.12.17"
+    - ARG HELM_VERSION="3.16.3"
+    - ARG YAMLFMT_VERSION="0.14.0"
+    - ARG KUBECTL_VERSION="1.32.0"
 
   append_final:
     - | # Required dependencies.
diff --git a/images/ci-builder/Dockerfile b/images/ci-builder/Dockerfile
index 85651735..8edeae89 100644
--- a/images/ci-builder/Dockerfile
+++ b/images/ci-builder/Dockerfile
@@ -1,9 +1,9 @@
 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
+ARG LAGOON_CLI_VERSION=0.31.2
 
 # Ensure temp files dont end up in image.
 VOLUME /tmp
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
 
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 \
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