Update to Alpine 3.21

tianon · Jan 6, 2025 · 83bc6e6 · 83bc6e6
1 parent add11f9
commit 83bc6e6
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 21 deletions.
diff --git a/backblaze-b2/Dockerfile b/backblaze-b2/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM python:3.13-alpine3.20
+FROM python:3.13-alpine3.21
 
 # https://pypi.org/project/b2/
 ENV BACKBLAZE_B2_VERSION 4.2.0

diff --git a/backblaze-b2/versions.json b/backblaze-b2/versions.json
@@ -2,7 +2,7 @@
   "version": "4.2.0",
   "python": {
     "version": "3.13",
-    "from": "python:3.13-alpine3.20",
+    "from": "python:3.13-alpine3.21",
     "arches": [
       "amd64",
       "arm32v6",

diff --git 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.20'
+export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.21'
 
 json="$(pypi 'b2')"
 

diff --git a/docker-master/Dockerfile b/docker-master/Dockerfile
@@ -137,7 +137,7 @@ RUN set -eux; \
 
 # TODO compose?
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN set -eux; \
 	apk add --no-cache \

diff --git a/docker-master/Dockerfile.template b/docker-master/Dockerfile.template
@@ -131,7 +131,7 @@ RUN set -eux; \
 
 # TODO compose?
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN set -eux; \
 	apk add --no-cache \

diff --git a/network-toolbox/alpine/Dockerfile b/network-toolbox/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \

diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache bash ca-certificates
 

diff --git a/prometheus/Dockerfile.template b/prometheus/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache bash ca-certificates
 

diff --git a/prometheus/alertmanager/Dockerfile b/prometheus/alertmanager/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache bash ca-certificates
 

diff --git a/prometheus/alertmanager/Dockerfile.template b/prometheus/alertmanager/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache bash ca-certificates
 

diff --git a/prometheus/blackbox-exporter/Dockerfile b/prometheus/blackbox-exporter/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache ca-certificates
 

diff --git a/prometheus/blackbox-exporter/Dockerfile.template b/prometheus/blackbox-exporter/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache ca-certificates
 

diff --git a/speedtest/Dockerfile b/speedtest/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # https://www.speedtest.net/apps/cli#download
 ENV SPEEDTEST_VERSION 1.2.0

diff --git a/speedtest/Dockerfile.template b/speedtest/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 # https://www.speedtest.net/apps/cli#download
 ENV SPEEDTEST_VERSION {{ .version }}

diff --git 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.20 AS build
+FROM alpine:3.21 AS build
 
 RUN set -eux; \
 	apk add --no-cache \

diff --git 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.20 AS build
+FROM alpine:3.21 AS build
 
 RUN set -eux; \
 	apk add --no-cache \

diff --git a/vultr-cli/Dockerfile b/vultr-cli/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache ca-certificates
 

diff --git a/vultr-cli/Dockerfile.template b/vultr-cli/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache ca-certificates
 

diff --git a/ymlfmt/Dockerfile b/ymlfmt/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM python:3.13-alpine3.20
+FROM python:3.13-alpine3.21
 
 RUN set -eux; \
 	apk add --no-cache --virtual .build-deps gcc libc-dev; \

diff --git a/ymlfmt/versions.json b/ymlfmt/versions.json
@@ -2,7 +2,7 @@
   "version": "0.18.9",
   "python": {
     "version": "3.13",
-    "from": "python:3.13-alpine3.20",
+    "from": "python:3.13-alpine3.21",
     "arches": [
       "amd64",
       "arm32v6",

diff --git 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.20'
+export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.21'
 
 json="$(pypi 'ruamel.yaml')"