From a978b3e42e9ed1f7409e9dc3b1959b744d129c7f Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>
Date: Thu, 6 Jun 2024 17:39:56 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=8C=20Update=20Alpine=20and=20Kubernet?=
 =?UTF-8?q?es=20CLI=20(#33)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>
---
 .devcontainer/devcontainer-lock.json | 6 +++---
 Dockerfile                           | 6 +++---
 test/container-structure-test.yml    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json
index e39b1dd..2d6de1d 100644
--- a/.devcontainer/devcontainer-lock.json
+++ b/.devcontainer/devcontainer-lock.json
@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "version": "2.10.2",
-      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:23ae11a86089da5f0b98a6edd603f91831802b7f2d5ef1e104e1b94a3beb546c",
-      "integrity": "sha256:23ae11a86089da5f0b98a6edd603f91831802b7f2d5ef1e104e1b94a3beb546c"
+      "version": "2.11.0",
+      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:503f23cd692325b3cbb8c20a0ecfabb3444b0c786b363e0c82572bd7d71dc099",
+      "integrity": "sha256:503f23cd692325b3cbb8c20a0ecfabb3444b0c786b363e0c82572bd7d71dc099"
     },
     "ghcr.io/ministryofjustice/devcontainer-feature/container-structure-test:1": {
       "version": "1.0.0",
diff --git a/Dockerfile b/Dockerfile
index e8dddef..9055e39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # checkov:skip=CKV_DOCKER_2:Healthcheck instructions have not been added to container images
-FROM docker.io/alpine:3.19.1
+FROM docker.io/alpine:3.20.0
 
 LABEL org.opencontainers.image.vendor="Ministry of Justice" \
       org.opencontainers.image.authors="Analytical Platform" \
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.vendor="Ministry of Justice" \
       org.opencontainers.image.description="kubectl image for Analytical Platform" \
       org.opencontainers.image.url="https://github.com/ministryofjustice/analytical-platform-kubectl"
 
-ARG KUBECTL_VERSION="v1.28.4"
+ARG KUBECTL_VERSION="v1.28.10"
 
 ENV CONTAINER_GID="10000" \
     CONTAINER_GROUP="nonroot" \
@@ -27,7 +27,7 @@ RUN addgroup \
     && mkdir --parents ${CONTAINER_HOME} \
     && chown --recursive ${CONTAINER_USER}:${CONTAINER_GROUP} ${CONTAINER_HOME} \
     && apk add --no-cache --virtual build \
-      curl==8.5.0-r0 \
+      curl==8.7.1-r0 \
     && curl --location "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" \
       --output /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubectl \
diff --git a/test/container-structure-test.yml b/test/container-structure-test.yml
index 744c020..d906803 100644
--- a/test/container-structure-test.yml
+++ b/test/container-structure-test.yml
@@ -8,7 +8,7 @@ commandTests:
   - name: "alpine"
     command: "grep"
     args: ["VERSION_ID", "/etc/os-release"]
-    expectedOutput: ["VERSION_ID=3.19.1"]
+    expectedOutput: ["VERSION_ID=3.20.0"]
 
   - name: "whoami"
     command: "whoami"