Skip to content

Commit

Permalink
📌 Update Alpine and Kubernetes CLI (#33)
Browse files Browse the repository at this point in the history
Signed-off-by: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>
  • Loading branch information
jacobwoffenden committed Jun 6, 2024
1 parent 7ec0980 commit a978b3e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# 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" \
org.opencontainers.image.title="kubectl Image" \
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" \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion test/container-structure-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a978b3e

Please sign in to comment.