diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 4003e685..50fddbae 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.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/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.22/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.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 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 559a5a67..1c2a5b9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.22 +FROM ghcr.io/linuxserver/baseimage-alpine:3.23 # set version label ARG BUILD_DATE @@ -10,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thespad" RUN \ - if [ -z ${WIREGUARD_RELEASE+x} ]; then \ - WIREGUARD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + 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 \ && awk '/^P:wireguard-tools$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ echo "**** install dependencies ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6f9c539e..668f98d1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23 # set version label ARG BUILD_DATE @@ -10,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thespad" RUN \ - if [ -z ${WIREGUARD_RELEASE+x} ]; then \ - WIREGUARD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + 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 \ && awk '/^P:wireguard-tools$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ echo "**** install dependencies ****" && \ diff --git a/Jenkinsfile b/Jenkinsfile index 7349171f..6d81efb3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,14 +20,14 @@ pipeline { QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') CONTAINER_NAME = 'wireguard' - BUILD_VERSION_ARG = 'WIREGUARD_VERSION' + BUILD_VERSION_ARG = 'WIREGUARD_RELEASE' LS_USER = 'linuxserver' LS_REPO = 'docker-wireguard' DOCKERHUB_IMAGE = 'linuxserver/wireguard' DEV_DOCKERHUB_IMAGE = 'lsiodev/wireguard' PR_DOCKERHUB_IMAGE = 'lspipepr/wireguard' DIST_IMAGE = 'alpine' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/' DIST_REPO_PACKAGES = 'wireguard-tools' MULTIARCH='true' CI='false' diff --git a/README.md b/README.md index aa189591..5e0f6df2 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 +* **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. * **15.07.25:** - Rebase to Alpine 3.22. Remove iptables-legacy shim. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 88a379db..24827ef5 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -8,14 +8,14 @@ release_tag: latest ls_branch: master repo_vars: - CONTAINER_NAME = 'wireguard' - - BUILD_VERSION_ARG = 'WIREGUARD_VERSION' + - BUILD_VERSION_ARG = 'WIREGUARD_RELEASE' - LS_USER = 'linuxserver' - LS_REPO = 'docker-wireguard' - DOCKERHUB_IMAGE = 'linuxserver/wireguard' - DEV_DOCKERHUB_IMAGE = 'lsiodev/wireguard' - PR_DOCKERHUB_IMAGE = 'lspipepr/wireguard' - DIST_IMAGE = 'alpine' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/' - DIST_REPO_PACKAGES = 'wireguard-tools' - MULTIARCH='true' - CI='false' diff --git a/readme-vars.yml b/readme-vars.yml index 71c4870d..0c2afd29 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -158,6 +158,7 @@ init_diagram: | "wireguard:latest" <- Base Images # changelog changelogs: + - {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."} - {date: "15.07.25:", desc: "Rebase to Alpine 3.22. Remove iptables-legacy shim."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run b/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run index 5c11cb31..4279d315 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run +++ b/root/etc/s6-overlay/s6-rc.d/init-wireguard-confs/run @@ -194,6 +194,10 @@ if [[ ! -f /config/coredns/Corefile ]]; then cp /defaults/Corefile /config/coredns/Corefile fi +# let openresolv take control of resolv.conf +resolvconf -a control 2>/dev/null < /etc/resolv.conf +resolvconf -u + # permissions lsiown -R abc:abc \ /config