shotgun upgrade to Alpine Linux 3.21

1ma · Dec 9, 2024 · 08fc241 · 08fc241
1 parent c6f0f25
commit 08fc241
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         images:
-          - { context: "alpine", tags: "1maa/alpine:3.20,1maa/alpine:latest", cache-tag: "1maa/alpine:3.20" }
+          - { context: "alpine", tags: "1maa/alpine:3.21,1maa/alpine:latest", cache-tag: "1maa/alpine:3.21" }
           - { context: "beanstalkd", tags: "1maa/beanstalkd:latest" }
           - { context: "core-lightning", tags: "1maa/core-lightning:latest", dockerfile: "core-lightning/alpine/Dockerfile" }
           - { context: "electrs", tags: "1maa/electrs:latest" }

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -5,7 +5,7 @@ COPY https-repositories .
 RUN chmod 644 https-repositories
 
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 # list of mirrors: https://mirrors.alpinelinux.org/
 COPY --from=0 https-repositories /etc/apk/repositories

diff --git a/alpine/https-repositories b/alpine/https-repositories
@@ -1,5 +1,5 @@
-https://dl-cdn.alpinelinux.org/alpine/v3.20/main
-https://dl-cdn.alpinelinux.org/alpine/v3.20/community
+https://dl-cdn.alpinelinux.org/alpine/v3.21/main
+https://dl-cdn.alpinelinux.org/alpine/v3.21/community
 @edge-main https://dl-cdn.alpinelinux.org/alpine/edge/main
 @edge-community https://dl-cdn.alpinelinux.org/alpine/edge/community
 @edge-testing https://dl-cdn.alpinelinux.org/alpine/edge/testing
diff --git a/beanstalkd/Dockerfile b/beanstalkd/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 WORKDIR /tmp
 

diff --git a/core-lightning/alpine/Dockerfile b/core-lightning/alpine/Dockerfile
@@ -7,9 +7,9 @@ ENV CGO_ENABLED=0
 RUN go install -trimpath -ldflags="-d -s -w" github.com/nbd-wtf/trustedcoin@${TRUSTEDCOIN_VERSION}
 
 
-FROM alpine:3.20 AS builder
+FROM alpine:3.21 AS builder
 
-ARG CLN_VERSION=v24.11
+ARG CLN_VERSION=v24.08.2
 
 RUN apk add --no-cache \
     autoconf \
@@ -58,7 +58,7 @@ RUN make install
 COPY --from=trustedcoin /go/bin/trustedcoin /usr/local/libexec/c-lightning/plugins/
 
 
-FROM alpine:3.20 AS final
+FROM alpine:3.21 AS final
 
 COPY --from=builder /usr/local/bin     /usr/local/bin
 COPY --from=builder /usr/local/libexec /usr/local/libexec

diff --git a/erlang/Dockerfile b/erlang/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20 AS build
+FROM alpine:3.21 AS build
 
 ARG ERLANG_VERSION=27.1.3
 
@@ -36,7 +36,7 @@ RUN make install \
  && find /usr/local -name src | xargs -r find | xargs rmdir -vp || true
 
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache \
     inotify-tools \

diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 ARG HAPROXY_VERSION=3.1.0
 

diff --git a/lua/Dockerfile b/lua/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 ARG LUA_VERSION=5.4.7
 

diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM 1maa/alpine:latest AS build
+FROM 1maa/alpine:3.20 AS build
 
 ARG PHP_VERSION=8.1.31
 ARG SECP256K1_NOSTR_EXT_VERSION=v0.1.3
@@ -247,7 +247,7 @@ RUN pecl channel-update pecl.php.net \
  && strip --strip-all /usr/lib/php/*.so
 
 
-FROM 1maa/alpine:latest AS php
+FROM 1maa/alpine:3.20 AS php
 
 COPY etc /etc/php
 

diff --git a/postgres/Dockerfile b/postgres/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20 AS builder
+FROM alpine:3.21 AS builder
 
 ARG POSTGRES_VERSION=17.2
 
@@ -32,7 +32,7 @@ RUN make -C postgresql-${POSTGRES_VERSION} world-bin -j$(nproc) \
  && make -C postgresql-${POSTGRES_VERSION} install-world-bin
 
 
-FROM 1maa/alpine:3.20 AS postgis
+FROM 1maa/alpine:3.21 AS postgis
 
 ARG PGTAP_VERSION=1.3.3
 ARG POSTGIS_VERSION=3.5.0
@@ -69,7 +69,7 @@ RUN tar zxf v${PGTAP_VERSION}.tar.gz \
  && make -C pgtap-${PGTAP_VERSION} -j$(nproc) \
  && make -C pgtap-${PGTAP_VERSION} install
 
-FROM alpine:3.20 AS cleanup
+FROM alpine:3.21 AS cleanup
 
 WORKDIR /tmp
 

diff --git a/protoc/Dockerfile b/protoc/Dockerfile
@@ -4,7 +4,7 @@ RUN go install -ldflags="-d -s -w" -trimpath google.golang.org/grpc/cmd/protoc-g
  && go install -ldflags="-d -s -w" -trimpath google.golang.org/protobuf/cmd/protoc-gen-go@latest
 
 
-FROM alpine:3.20 AS types
+FROM alpine:3.21 AS types
 
 ARG PROTOC_VERSION=24.4
 
@@ -17,7 +17,7 @@ RUN unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip \
  && find ./include -type f -exec chmod 644 {} \;
 
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 COPY --from=plugins /go/bin      /usr/local/bin
 COPY --from=types   /tmp/include /usr/include

diff --git a/selfsig/Dockerfile b/selfsig/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV ALGO rsa
 ENV BITS 4096

diff --git a/sqlite/Dockerfile b/sqlite/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 # References:
 #   https://www.sqlite.org/howtocompile.html