From f447779034f00d8d9e7d658bf4cc4b3164d7710e Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 5 Jul 2026 14:30:18 +0000 Subject: [PATCH] Rebase to 3.24 --- .github/workflows/external_trigger.yml | 4 ++-- Dockerfile | 5 ++--- Dockerfile.aarch64 | 5 ++--- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 50fddbae..340227cf 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 \`wireguard_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.23/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:'"wireguard-tools"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY if grep -q "^wireguard_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.23/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"wireguard-tools"'$/,/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:'"wireguard-tools"'$/,/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 wireguard 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 1c2a5b9c..1f2f291e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:3.24 # set version label ARG BUILD_DATE @@ -11,7 +11,7 @@ LABEL maintainer="thespad" RUN \ if [ -z "${WIREGUARD_RELEASE+x}" ]; then \ - WIREGUARD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + WIREGUARD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.24/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:wireguard-tools$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ echo "**** install dependencies ****" && \ @@ -31,7 +31,6 @@ RUN \ openresolv \ wireguard-tools==${WIREGUARD_RELEASE} && \ echo "wireguard" >> /etc/modules && \ - sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' /usr/bin/wg-quick && \ rm -rf /etc/wireguard && \ ln -s /config/wg_confs /etc/wireguard && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 668f98d1..6f1ca3fb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.24 # set version label ARG BUILD_DATE @@ -11,7 +11,7 @@ LABEL maintainer="thespad" RUN \ if [ -z "${WIREGUARD_RELEASE+x}" ]; then \ - WIREGUARD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + WIREGUARD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.24/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:wireguard-tools$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ echo "**** install dependencies ****" && \ @@ -31,7 +31,6 @@ RUN \ openresolv \ wireguard-tools==${WIREGUARD_RELEASE} && \ echo "wireguard" >> /etc/modules && \ - sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' /usr/bin/wg-quick && \ rm -rf /etc/wireguard && \ ln -s /config/wg_confs /etc/wireguard && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ diff --git a/Jenkinsfile b/Jenkinsfile index 5dc1e8ba..037f6054 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/wireguard' PR_DOCKERHUB_IMAGE = 'lspipepr/wireguard' DIST_IMAGE = 'alpine' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.24/main/' DIST_REPO_PACKAGES = 'wireguard-tools' MULTIARCH='true' CI='false' diff --git a/README.md b/README.md index 652129df..314f84a7 100644 --- a/README.md +++ b/README.md @@ -385,6 +385,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.07.26:** - Rebase to Alpine 3.24. * **24.01.26:** - Rebase to Alpine 3.23 again as openresolv alpine 3.23 package has now been updated. * **22.01.26:** - Revert to Alpine 3.22 due to resolvconf bug. * **04.01.26:** - Rebase to Alpine 3.23. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 24827ef5..32cf5b7a 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,7 +15,7 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/wireguard' - PR_DOCKERHUB_IMAGE = 'lspipepr/wireguard' - DIST_IMAGE = 'alpine' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.24/main/' - DIST_REPO_PACKAGES = 'wireguard-tools' - MULTIARCH='true' - CI='false' diff --git a/readme-vars.yml b/readme-vars.yml index 643bce8e..bcd8df5b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -158,6 +158,7 @@ init_diagram: | "wireguard:latest" <- Base Images # changelog changelogs: + - {date: "05.07.26:", desc: "Rebase to Alpine 3.24."} - {date: "24.01.26:", desc: "Rebase to Alpine 3.23 again as openresolv alpine 3.23 package has now been updated."} - {date: "22.01.26:", desc: "Revert to Alpine 3.22 due to resolvconf bug."} - {date: "04.01.26:", desc: "Rebase to Alpine 3.23."}