From 4725c625c22d968476ffe93225ef6a7a23ba344d Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 5 Jul 2026 09:43:57 +0000 Subject: [PATCH 1/2] Rebase to 3.24 --- .github/workflows/external_trigger.yml | 4 +- Dockerfile | 63 +++++++++++++------------- Dockerfile.aarch64 | 63 +++++++++++++------------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 7 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 36cd942..4f288ec 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -29,7 +29,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of master branch. To disable this trigger, add \`nginx_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.24/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY if grep -q "^nginx_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then @@ -107,7 +107,7 @@ jobs: if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 - elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then + elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.24/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="New version ${EXT_RELEASE} for nginx tag latest is detected, however not all arch repos are updated yet. Will try again later." curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, diff --git a/Dockerfile b/Dockerfile index e2cd845..4fd06a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.24 # set version label ARG BUILD_DATE @@ -13,7 +13,7 @@ LABEL maintainer="nemchik" # install packages RUN \ if [ -z ${NGINX_VERSION+x} ]; then \ - NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.24/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ @@ -39,36 +39,35 @@ RUN \ nginx-mod-stream-geoip==${NGINX_VERSION} \ nginx-mod-stream-geoip2==${NGINX_VERSION} \ nginx-vim==${NGINX_VERSION} \ - php84-bcmath \ - php84-bz2 \ - php84-dom \ - php84-exif \ - php84-ftp \ - php84-gd \ - php84-gmp \ - php84-imap \ - php84-intl \ - php84-ldap \ - php84-mysqli \ - php84-mysqlnd \ - php84-opcache \ - php84-pdo_mysql \ - php84-pdo_odbc \ - php84-pdo_pgsql \ - php84-pdo_sqlite \ - php84-pear \ - php84-pecl-apcu \ - php84-pecl-memcached \ - php84-pecl-redis \ - php84-pgsql \ - php84-posix \ - php84-soap \ - php84-sockets \ - php84-sodium \ - php84-sqlite3 \ - php84-tokenizer \ - php84-xmlreader \ - php84-xsl && \ + php85-bcmath \ + php85-bz2 \ + php85-dom \ + php85-exif \ + php85-ftp \ + php85-gd \ + php85-gmp \ + php85-imap \ + php85-intl \ + php85-ldap \ + php85-mysqli \ + php85-mysqlnd \ + php85-pdo_mysql \ + php85-pdo_odbc \ + php85-pdo_pgsql \ + php85-pdo_sqlite \ + php85-pear \ + php85-pecl-apcu \ + php85-pecl-memcached \ + php85-pecl-redis \ + php85-pgsql \ + php85-posix \ + php85-soap \ + php85-sockets \ + php85-sodium \ + php85-sqlite3 \ + php85-tokenizer \ + php85-xmlreader \ + php85-xsl && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ rm -f /etc/nginx/conf.d/stream.conf diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5ec5853..d8d9e6d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.24 # set version label ARG BUILD_DATE @@ -13,7 +13,7 @@ LABEL maintainer="nemchik" # install packages RUN \ if [ -z ${NGINX_VERSION+x} ]; then \ - NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.24/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:nginx$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ @@ -39,36 +39,35 @@ RUN \ nginx-mod-stream-geoip==${NGINX_VERSION} \ nginx-mod-stream-geoip2==${NGINX_VERSION} \ nginx-vim==${NGINX_VERSION} \ - php84-bcmath \ - php84-bz2 \ - php84-dom \ - php84-exif \ - php84-ftp \ - php84-gd \ - php84-gmp \ - php84-imap \ - php84-intl \ - php84-ldap \ - php84-mysqli \ - php84-mysqlnd \ - php84-opcache \ - php84-pdo_mysql \ - php84-pdo_odbc \ - php84-pdo_pgsql \ - php84-pdo_sqlite \ - php84-pear \ - php84-pecl-apcu \ - php84-pecl-memcached \ - php84-pecl-redis \ - php84-pgsql \ - php84-posix \ - php84-soap \ - php84-sockets \ - php84-sodium \ - php84-sqlite3 \ - php84-tokenizer \ - php84-xmlreader \ - php84-xsl && \ + php85-bcmath \ + php85-bz2 \ + php85-dom \ + php85-exif \ + php85-ftp \ + php85-gd \ + php85-gmp \ + php85-imap \ + php85-intl \ + php85-ldap \ + php85-mysqli \ + php85-mysqlnd \ + php85-pdo_mysql \ + php85-pdo_odbc \ + php85-pdo_pgsql \ + php85-pdo_sqlite \ + php85-pear \ + php85-pecl-apcu \ + php85-pecl-memcached \ + php85-pecl-redis \ + php85-pgsql \ + php85-posix \ + php85-soap \ + php85-sockets \ + php85-sodium \ + php85-sqlite3 \ + php85-tokenizer \ + php85-xmlreader \ + php85-xsl && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ rm -f /etc/nginx/conf.d/stream.conf diff --git a/Jenkinsfile b/Jenkinsfile index debd13f..ebbd161 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/nginx' PR_DOCKERHUB_IMAGE = 'lspipepr/nginx' DIST_IMAGE = 'alpine' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.24/main/' DIST_REPO_PACKAGES = 'nginx' MULTIARCH='true' CI='true' diff --git a/README.md b/README.md index f650619..985a5bb 100644 --- a/README.md +++ b/README.md @@ -291,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.07.26:** - Rebase to Alpine 3.24 with PHP 8.5. * **13.07.25:** - Fixed auto-reload functionality. * **16.06.25:** - Rebase to Alpine 3.22 with PHP 8.4. Add [Auto Reload](https://github.com/linuxserver/docker-mods/tree/swag-auto-reload) functionality. Drop PHP bindings for mcrypt as it is no longer maintained. * **17.12.24:** - Rebase to Alpine 3.21. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e03bfe9..88f9f0b 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,7 +15,7 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/nginx' - PR_DOCKERHUB_IMAGE = 'lspipepr/nginx' - DIST_IMAGE = 'alpine' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.24/main/' - DIST_REPO_PACKAGES = 'nginx' - MULTIARCH='true' - CI='true' diff --git a/readme-vars.yml b/readme-vars.yml index b5d9a0d..d20ca5f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -87,6 +87,7 @@ init_diagram: | "nginx:latest" <- Base Images # changelog changelogs: + - {date: "05.07.26:", desc: "Rebase to Alpine 3.24 with PHP 8.5."} - {date: "13.07.25:", desc: "Fixed auto-reload functionality."} - {date: "16.06.25:", desc: "Rebase to Alpine 3.22 with PHP 8.4. Add [Auto Reload](https://github.com/linuxserver/docker-mods/tree/swag-auto-reload) functionality. Drop PHP bindings for mcrypt as it is no longer maintained."} - {date: "17.12.24:", desc: "Rebase to Alpine 3.21."} From 2300308fd36183d0d1bf3cb7255ddda49f91e5c2 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 5 Jul 2026 09:44:57 +0000 Subject: [PATCH 2/2] Update project blurb --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index d20ca5f..264ec84 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -4,7 +4,7 @@ project_name: nginx project_url: "https://nginx.org/" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nginx-banner.png" -project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a simple webserver with php support. The config files reside in `/config` for easy user customization." +project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is an HTTP web server, reverse proxy, content cache, load balancer, TCP/UDP proxy server, and mail proxy server." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_categories: "Reverse Proxy" # supported architectures