From 83bc6e6e56890e73f284c431853bd3fcaf317000 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Sun, 5 Jan 2025 20:38:19 -0800 Subject: [PATCH] Update to Alpine 3.21 --- 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 94bf3585b08..212cbd8e9b3 100644 --- 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 index 188d8649590..663e40593b9 100644 --- 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 index 13af61713d0..3a286c623b1 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.20' +export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.21' json="$(pypi 'b2')" diff --git a/docker-master/Dockerfile b/docker-master/Dockerfile index 36ed733c113..289788cc7f6 100644 --- 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 index 8215149eebb..434a48e76fd 100644 --- 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 index 4f5f7ab0f92..e50f2cd16e8 100644 --- 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 index c6b21e7137f..2cfb86a5d84 100644 --- 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 index 7ea63da9ef7..9c1c8dae4a7 100644 --- 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 index b23eb55a35a..bd5e2665b81 100644 --- 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 index c2bf7cceada..0aea04ce1e2 100644 --- 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 index bafebb5c831..bf36bc33a45 100644 --- 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 index e56b2d53891..a989ff85620 100644 --- 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 index d9cfd4e0120..e41ed772991 100644 --- 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 index cb972857c0f..3628ece7dff 100644 --- 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 index c3c4fb4fafb..07244e141a4 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.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 index 140c40bf242..0e33d3eb02e 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.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 index c398e85c629..9f1722bc879 100644 --- 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 index 44536a30445..061a9e045f7 100644 --- 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 index d90e927461e..879879e6303 100644 --- 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 index 30105aecd60..1f8759a30aa 100644 --- 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 index b1c8501e5a6..dea76a5afb0 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.20' +export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-alpine3.21' json="$(pypi 'ruamel.yaml')"