Rebase to 3.22

Dockerfile

@@ -2,7 +2,7 @@
 
 FROM ghcr.io/sigstore/cosign/cosign:latest AS cosign-bin
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
 
 # set version label
 ARG BUILD_DATE
@@ -21,26 +21,26 @@ RUN --mount=type=bind,from=cosign-bin,source=/ko-app/cosign,target=/usr/local/bi
     grep \
     imagemagick \
     jpegoptim \
-    php83-bcmath \
-    php83-dom \
-    php83-exif \
-    php83-gd \
-    php83-intl \
-    php83-mysqli \
-    php83-pdo_mysql \
-    php83-pdo_pgsql \
-    php83-pdo_sqlite \
-    php83-pecl-imagick \
-    php83-pecl-redis \
-    php83-pgsql \
-    php83-sodium \
-    php83-sqlite3 \
-    php83-tokenizer \
-    postgresql15-client \
+    php84-bcmath \
+    php84-dom \
+    php84-exif \
+    php84-gd \
+    php84-intl \
+    php84-mysqli \
+    php84-pdo_mysql \
+    php84-pdo_pgsql \
+    php84-pdo_sqlite \
+    php84-pecl-imagick \
+    php84-pecl-redis \
+    php84-pgsql \
+    php84-sodium \
+    php84-sqlite3 \
+    php84-tokenizer \
+    postgresql16-client \
     unzip && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
   echo "**** install lychee ****" && \
   if [ -z "${LYCHEE_VERSION}" ]; then \
     LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \

Dockerfile.aarch64

@@ -2,7 +2,7 @@
 
 FROM ghcr.io/sigstore/cosign/cosign:latest AS cosign-bin
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
 
 # set version label
 ARG BUILD_DATE
@@ -21,26 +21,26 @@ RUN --mount=type=bind,from=cosign-bin,source=/ko-app/cosign,target=/usr/local/bi
     grep \
     imagemagick \
     jpegoptim \
-    php83-bcmath \
-    php83-dom \
-    php83-exif \
-    php83-gd \
-    php83-intl \
-    php83-mysqli \
-    php83-pdo_mysql \
-    php83-pdo_pgsql \
-    php83-pdo_sqlite \
-    php83-pecl-imagick \
-    php83-pecl-redis \
-    php83-pgsql \
-    php83-sodium \
-    php83-sqlite3 \
-    php83-tokenizer \
-    postgresql15-client \
+    php84-bcmath \
+    php84-dom \
+    php84-exif \
+    php84-gd \
+    php84-intl \
+    php84-mysqli \
+    php84-pdo_mysql \
+    php84-pdo_pgsql \
+    php84-pdo_sqlite \
+    php84-pecl-imagick \
+    php84-pecl-redis \
+    php84-pgsql \
+    php84-sodium \
+    php84-sqlite3 \
+    php84-tokenizer \
+    postgresql16-client \
     unzip && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
   echo "**** install lychee ****" && \
   if [ -z "${LYCHEE_VERSION}" ]; then \
     LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \

README.md

@@ -323,6 +323,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **09.07.25:** - Rebase to Alpine 3.20.
 * **03.12.24:** - Verify build artifacts with cosign.
 * **27.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **18.01.24:** - Add php-sodium.

jenkins-vars.yml

@@ -25,7 +25,7 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='80'
   - CI_SSL='false'
-  - CI_DELAY='60'
+  - CI_DELAY='120'
   - CI_DOCKERENV='DB_CONNECTION=sqlite'
   - CI_AUTH=''
   - CI_WEBPATH=''

readme-vars.yml

@@ -119,6 +119,7 @@ init_diagram: |
   "lychee:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "09.07.25:", desc: "Rebase to Alpine 3.20."}
   - {date: "03.12.24:", desc: "Verify build artifacts with cosign."}
   - {date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "18.01.24:", desc: "Add php-sodium."}

root/etc/s6-overlay/s6-rc.d/init-lychee-config/run

@@ -30,8 +30,8 @@ if [[ ! -L /app/www/storage/logs ]]; then
 fi
 
 cp -n /defaults/user.ini /config/user.ini 2> >(grep -v 'cp: not replacing')
-rm -rf /etc/php83/conf.d/99-user.ini
-ln -s /config/user.ini /etc/php83/conf.d/99-user.ini
+rm -rf /etc/php84/conf.d/99-user.ini
+ln -s /config/user.ini /etc/php84/conf.d/99-user.ini
 
 cd /app/www || exit 1
 
@@ -71,7 +71,7 @@ elif [[ "${DB_CONNECTION}" = "pgsql" ]]; then
     echo "Waiting for DB to be available"
     END=$((SECONDS + 30))
     while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do
-        if pg_isready -h "${DB_HOST}" -p "${DB_PORT}" -q; then
+        if pg_isready -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USERNAME}" -q; then
             if [[ -n "${RUN}" ]]; then
                 break
             fi