From db0f6ee0255939e0ffdcaad0aa28bd417d3e5f76 Mon Sep 17 00:00:00 2001
From: Pi-Farm <info@pi-farm.de>
Date: Wed, 4 Feb 2026 17:04:35 +0100
Subject: [PATCH] switch back to alpine-version 3.23

---
 .gitea/workflows/docker-builder.yml |  2 +-
 Dockerfile                          |  4 ++--
 Dockerfile.aarch64                  | 13 ++++---------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/docker-builder.yml b/.gitea/workflows/docker-builder.yml
index da8bdd2..7c21a72 100644
--- a/.gitea/workflows/docker-builder.yml
+++ b/.gitea/workflows/docker-builder.yml
@@ -48,7 +48,7 @@ jobs:
           docker push git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION}
       
 
-      - name: Build & push multi-arch image
+      - name: Build & push arm64 with buildx builder
         run: |
           docker buildx build \
             --platform linux/arm64 \
diff --git a/Dockerfile b/Dockerfile
index a24757c..d1ac931 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:3.21 AS rootfs-stage
+FROM alpine:3.23 AS rootfs-stage
 
 ARG S6_OVERLAY_VERSION="3.2.2.0"
 ARG ROOTFS=/root-out
-ARG REL=v3.21
+ARG REL=v3.23
 ARG ARCH=x86_64
 ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
 ARG PACKAGES=alpine-baselayout,\
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4edc566..afcb1e9 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:3.21 AS rootfs-stage
+FROM alpine:3.23 AS rootfs-stage
 
 ARG S6_OVERLAY_VERSION="3.2.2.0"
 ARG ROOTFS=/root-out
-ARG REL=v3.21
+ARG REL=v3.23
 ARG ARCH=aarch64
 ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
 ARG PACKAGES=alpine-baselayout,\
@@ -22,17 +22,12 @@ RUN \
 # build rootfs
 RUN \
   mkdir -p "${ROOTFS}/etc/apk" && \
-  cp -a /etc/apk/keys "${ROOTFS}/etc/apk/" && \
   { \
     echo "${MIRROR}/${REL}/main"; \
     echo "${MIRROR}/${REL}/community"; \
   } > "${ROOTFS}/etc/apk/repositories" && \
-  apk --root "${ROOTFS}" \
-      --no-cache \
-      --arch ${ARCH} \
-      --initdb \
-      add ${PACKAGES//,/ } && \
-  sed -i -e 's/^root::/root:!:/' "${ROOTFS}/etc/shadow"
+  apk --root "${ROOTFS}" --no-cache --keys-dir /etc/apk/keys add --arch ${ARCH} --initdb ${PACKAGES//,/ } && \
+  sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow
 
 # add s6 overlay
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp