From 2e426424f0b9996083a93fe83d456fc6ed4cd51c Mon Sep 17 00:00:00 2001 From: Demonsthere Date: Wed, 29 Jan 2025 10:55:11 +0100 Subject: [PATCH 1/2] chore: bump alpine to 3.21.2 --- Makefile | 4 ++++ docker/Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 26807c6..9e31522 100644 --- a/Makefile +++ b/Makefile @@ -3,3 +3,7 @@ format: licenses: @echo "No license checks necessary in this repository (yet)." + +.PHONY: docker +docker: + docker build -t oryd/k8s-toolbox:dev -f docker/Dockerfile . diff --git a/docker/Dockerfile b/docker/Dockerfile index a2ea91e..e13045b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,10 @@ -FROM alpine:3.20 +FROM alpine:3.21.2 ARG USER=ory ARG BUILD_ARCH=amd64 ENV HOME=/home/$USER ENV JQ_VERSION=1.7.1 -ENV KUBECTL_VERSION=1.31.2 +ENV KUBECTL_VERSION=1.32.1 RUN apk add --no-cache --update-cache --upgrade --latest \ ca-certificates curl netcat-openbsd coreutils bash inotify-tools procps From 902d29e712caa0bf31f1591c561005b636480f9b Mon Sep 17 00:00:00 2001 From: Demonsthere Date: Wed, 29 Jan 2025 11:00:15 +0100 Subject: [PATCH 2/2] chore: dont use latest package --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e13045b..e472bcd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ ENV HOME=/home/$USER ENV JQ_VERSION=1.7.1 ENV KUBECTL_VERSION=1.32.1 -RUN apk add --no-cache --update-cache --upgrade --latest \ +RUN apk add --no-cache --update-cache --upgrade \ ca-certificates curl netcat-openbsd coreutils bash inotify-tools procps RUN curl -Lo /usr/local/bin/jq "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux-${BUILD_ARCH}" &&\