Alpine 3.21.0

bin/helper

@@ -2,7 +2,7 @@
 
 COMMAND=$1
 LATEST_ALPINE_MINOR=3.20
-LATEST_ALPINE_VERSION=3.20.3
+LATEST_ALPINE_VERSION=3.21.0
 FALLBACK_VERSION_82="8.2.26"
 FALLBACK_VERSION_83="8.3.14"
 FALLBACK_VERSION_84="8.4.1"
@@ -34,13 +34,13 @@ then
 
   if [[ $BRANCH == 8.2 ]]
   then
-    URL="https://git.alpinelinux.org/aports/plain/community/php82/APKBUILD?h=3.20-stable"
+    URL="https://git.alpinelinux.org/aports/plain/community/php82/APKBUILD?h=3.21-stable"
   elif [[ $BRANCH == 8.3 ]]
   then
-    URL="https://git.alpinelinux.org/aports/plain/community/php83/APKBUILD?h=3.20-stable"
+    URL="https://git.alpinelinux.org/aports/plain/community/php83/APKBUILD?h=3.21-stable"
   elif [[ $BRANCH == 8.4 ]]
   then
-    URL="https://git.alpinelinux.org/aports/plain/testing/php84/APKBUILD"
+    URL="https://git.alpinelinux.org/aports/plain/community/php84/APKBUILD?h=3.21-stable"
   else
     echo "Not supported PHP version: $BRANCH" && exit 1
   fi

php/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
-ARG ALPINE_VERSION
-ARG PHP_SHORT_VERSION
+ARG ALPINE_VERSION=3.21.0
+ARG PHP_SHORT_VERSION=82
 
 #
 # libiconv
@@ -33,7 +33,8 @@ ADD --chmod=0644 https://dl.cacerts.digicert.com/DigiCertGlobalRootCA.crt.pem /o
 
 RUN <<EOF
 apk update && apk upgrade
-apk --no-cache add bash curl git make msmtp nano neofetch ssmtp sudo tar tini
+apk --no-cache add bash curl git make msmtp nano ssmtp sudo tar tini
+apk --no-cache add --repository=https://dl-cdn.alpinelinux.org/alpine/v3.20/community neofetch
 neofetch
 addgroup -S ${DEFAULT_USER} -g ${DEFAULT_USER_UID}
 adduser -D -S -G ${DEFAULT_USER} -u ${DEFAULT_USER_UID} -s /bin/bash ${DEFAULT_USER}
@@ -114,7 +115,7 @@ ENV PHP_INSTALL_VERSION=84
 
 RUN sudo -s <<EOF
 apk update
-apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing add libcrypto3 libssl3 libzip \
+apk --no-cache add libcrypto3 libssl3 libzip \
   php84 php84-{curl,fileinfo,iconv,mbstring,opcache,openssl,phar,session,zip} \
   php84-pecl-{apcu,imagick,redis,uploadprogress,xdebug}
 ln -sfn /usr/bin/php84 /usr/bin/php
@@ -171,7 +172,7 @@ COPY files/etc/php/php-fpm.d/www.conf.ep /etc/php83/php-fpm.d/www.conf.ep
 FROM final-php AS build-php-fpm-84
 
 RUN sudo -s <<EOF
-apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing add php84-fpm
+apk --no-cache add php84-fpm
 ln -sfn /usr/sbin/php-fpm84 /usr/sbin/php-fpm
 EOF
 
@@ -217,7 +218,7 @@ FROM final-php-fpm AS drupal-php-84
 
 RUN sudo -s <<EOF
 apk --no-cache add mysql-client openssh rsync libavif icu-libs libsodium mariadb-connector-c
-apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing add \
+apk --no-cache add \
     php84-{bcmath,ctype,dom,exif,gd,intl,pdo,pdo_mysql,simplexml,soap,sockets,sodium,tokenizer,xml,xmlreader,xmlwriter}
 EOF
 

php/docker-bake.hcl

@@ -1,5 +1,5 @@
 variable "ALPINE_VERSION" {
-  default = "3.20.3"
+  default = "3.21.0"
 }
 
 variable "REPO_BASE" {