From abf04d1224a7d3c69bc7c4e5cda4b91e9cadbf27 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 30 May 2025 15:45:10 -0700 Subject: [PATCH] Update to Alpine 3.22 --- backblaze-b2/Dockerfile | 2 +- backblaze-b2/versions.json | 2 +- backblaze-b2/versions.sh | 2 +- docker-master/Dockerfile | 2 +- docker-master/Dockerfile.template | 2 +- network-toolbox/alpine/Dockerfile | 2 +- prometheus/Dockerfile | 2 +- prometheus/Dockerfile.template | 2 +- prometheus/alertmanager/Dockerfile | 2 +- prometheus/alertmanager/Dockerfile.template | 2 +- prometheus/blackbox-exporter/Dockerfile | 2 +- prometheus/blackbox-exporter/Dockerfile.template | 2 +- speedtest/Dockerfile | 2 +- speedtest/Dockerfile.template | 2 +- toybox/Dockerfile | 2 +- toybox/Dockerfile.template | 2 +- vultr-cli/Dockerfile | 2 +- vultr-cli/Dockerfile.template | 2 +- ymlfmt/Dockerfile | 2 +- ymlfmt/versions.json | 2 +- ymlfmt/versions.sh | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/backblaze-b2/Dockerfile b/backblaze-b2/Dockerfile index 517672a08f1..012a9efd03c 100644 --- a/backblaze-b2/Dockerfile +++ b/backblaze-b2/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.13-alpine3.21 +FROM python:3.13-alpine3.22 # https://pypi.org/project/b2/ ENV BACKBLAZE_B2_VERSION 4.3.2 diff --git a/backblaze-b2/versions.json b/backblaze-b2/versions.json index 92d2e32c726..590b8c4643d 100644 --- a/backblaze-b2/versions.json +++ b/backblaze-b2/versions.json @@ -2,7 +2,7 @@ "version": "4.3.2", "python": { "version": "3.13", - "from": "python:3.13-alpine3.21", + "from": "python:3.13-alpine3.22", "arches": [ "amd64", "arm32v6", diff --git a/backblaze-b2/versions.sh b/backblaze-b2/versions.sh index 3a286c623b1..52925e4f7a9 100755 --- a/backblaze-b2/versions.sh +++ b/backblaze-b2/versions.sh @@ -9,7 +9,7 @@ source "$dir/../.libs/pypi.sh" versions_hooks+=( hook_no-prereleases ) -export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.21' +export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.22' json="$(pypi 'b2')" diff --git a/docker-master/Dockerfile b/docker-master/Dockerfile index 1acad7fca7a..0b6e6079b13 100644 --- a/docker-master/Dockerfile +++ b/docker-master/Dockerfile @@ -134,7 +134,7 @@ RUN set -eux; \ # TODO compose? -FROM alpine:3.21 +FROM alpine:3.22 RUN set -eux; \ apk add --no-cache \ diff --git a/docker-master/Dockerfile.template b/docker-master/Dockerfile.template index 38b1b6c84fd..03b85939c7c 100644 --- a/docker-master/Dockerfile.template +++ b/docker-master/Dockerfile.template @@ -128,7 +128,7 @@ RUN set -eux; \ # TODO compose? -FROM alpine:3.21 +FROM alpine:3.22 RUN set -eux; \ apk add --no-cache \ diff --git a/network-toolbox/alpine/Dockerfile b/network-toolbox/alpine/Dockerfile index e50f2cd16e8..2a22f7858a9 100644 --- a/network-toolbox/alpine/Dockerfile +++ b/network-toolbox/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.21 +FROM alpine:3.22 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile index e7d738b6742..e42dfe81736 100644 --- a/prometheus/Dockerfile +++ b/prometheus/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache bash ca-certificates diff --git a/prometheus/Dockerfile.template b/prometheus/Dockerfile.template index 9bbd06fe417..48bad930038 100644 --- a/prometheus/Dockerfile.template +++ b/prometheus/Dockerfile.template @@ -1,4 +1,4 @@ -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache bash ca-certificates diff --git a/prometheus/alertmanager/Dockerfile b/prometheus/alertmanager/Dockerfile index 0fef3148343..c8279dd7fbd 100644 --- a/prometheus/alertmanager/Dockerfile +++ b/prometheus/alertmanager/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache bash ca-certificates diff --git a/prometheus/alertmanager/Dockerfile.template b/prometheus/alertmanager/Dockerfile.template index 0aea04ce1e2..f671ab61405 100644 --- a/prometheus/alertmanager/Dockerfile.template +++ b/prometheus/alertmanager/Dockerfile.template @@ -1,4 +1,4 @@ -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache bash ca-certificates diff --git a/prometheus/blackbox-exporter/Dockerfile b/prometheus/blackbox-exporter/Dockerfile index b1f1b314769..f09f067e842 100644 --- a/prometheus/blackbox-exporter/Dockerfile +++ b/prometheus/blackbox-exporter/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates diff --git a/prometheus/blackbox-exporter/Dockerfile.template b/prometheus/blackbox-exporter/Dockerfile.template index b5d25a5262c..650b8b48269 100644 --- a/prometheus/blackbox-exporter/Dockerfile.template +++ b/prometheus/blackbox-exporter/Dockerfile.template @@ -1,4 +1,4 @@ -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates diff --git a/speedtest/Dockerfile b/speedtest/Dockerfile index e41ed772991..361d5d3b053 100644 --- a/speedtest/Dockerfile +++ b/speedtest/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.22 # https://www.speedtest.net/apps/cli#download ENV SPEEDTEST_VERSION 1.2.0 diff --git a/speedtest/Dockerfile.template b/speedtest/Dockerfile.template index 3628ece7dff..6d8627b49e4 100644 --- a/speedtest/Dockerfile.template +++ b/speedtest/Dockerfile.template @@ -1,4 +1,4 @@ -FROM alpine:3.21 +FROM alpine:3.22 # https://www.speedtest.net/apps/cli#download ENV SPEEDTEST_VERSION {{ .version }} diff --git a/toybox/Dockerfile b/toybox/Dockerfile index b0a20d7daf4..81cc77699bf 100644 --- a/toybox/Dockerfile +++ b/toybox/Dockerfile @@ -7,7 +7,7 @@ # ideally, we'd use official static binary releases from http://landley.net/toybox/downloads/binaries/ but they don't include the (pending) "sh" implementation so they're not quite enough for a full system yet # https://github.com/landley/toybox/commits/master/toys/pending/sh.c -FROM alpine:3.21 AS build +FROM alpine:3.22 AS build RUN set -eux; \ apk add --no-cache \ diff --git a/toybox/Dockerfile.template b/toybox/Dockerfile.template index 0e33d3eb02e..fca07f82cf2 100644 --- a/toybox/Dockerfile.template +++ b/toybox/Dockerfile.template @@ -1,7 +1,7 @@ # ideally, we'd use official static binary releases from http://landley.net/toybox/downloads/binaries/ but they don't include the (pending) "sh" implementation so they're not quite enough for a full system yet # https://github.com/landley/toybox/commits/master/toys/pending/sh.c -FROM alpine:3.21 AS build +FROM alpine:3.22 AS build RUN set -eux; \ apk add --no-cache \ diff --git a/vultr-cli/Dockerfile b/vultr-cli/Dockerfile index 9f1722bc879..6659e74d57b 100644 --- a/vultr-cli/Dockerfile +++ b/vultr-cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates diff --git a/vultr-cli/Dockerfile.template b/vultr-cli/Dockerfile.template index 061a9e045f7..8ae98935ce5 100644 --- a/vultr-cli/Dockerfile.template +++ b/vultr-cli/Dockerfile.template @@ -1,4 +1,4 @@ -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates diff --git a/ymlfmt/Dockerfile b/ymlfmt/Dockerfile index 46503849db1..65427a5c624 100644 --- a/ymlfmt/Dockerfile +++ b/ymlfmt/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.13-alpine3.21 +FROM python:3.13-alpine3.22 RUN set -eux; \ apk add --no-cache --virtual .build-deps gcc libc-dev; \ diff --git a/ymlfmt/versions.json b/ymlfmt/versions.json index 3ce089f13a3..d5d140c9826 100644 --- a/ymlfmt/versions.json +++ b/ymlfmt/versions.json @@ -2,7 +2,7 @@ "version": "0.18.11", "python": { "version": "3.13", - "from": "python:3.13-alpine3.21", + "from": "python:3.13-alpine3.22", "arches": [ "amd64", "arm32v6", diff --git a/ymlfmt/versions.sh b/ymlfmt/versions.sh index dea76a5afb0..69e105022a4 100755 --- a/ymlfmt/versions.sh +++ b/ymlfmt/versions.sh @@ -9,7 +9,7 @@ source "$dir/../.libs/pypi.sh" versions_hooks+=( hook_no-prereleases ) -export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.21' +export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.22' json="$(pypi 'ruamel.yaml')"