From 9a9a4519f510b17f8109117c15263a0ddda12a7b Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 26 Dec 2025 14:45:41 +0000 Subject: [PATCH 1/2] Rebase to 3.23 --- .github/workflows/external_trigger.yml | 4 ++-- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.riscv64 | 4 ++-- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index ad235ed..a6864f1 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 main branch. To disable this trigger, add \`socket-proxy_main\` 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/v2.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:'"haproxy"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY if grep -q "^socket-proxy_main_${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:'"haproxy"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]] || [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/riscv64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"haproxy"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then + elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"haproxy"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]] || [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/riscv64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"haproxy"'$/,/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 socket-proxy 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 4668fe2..c1a92c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/alpine:3.22 +FROM docker.io/alpine:2.23 # set version label ARG BUILD_DATE @@ -17,7 +17,7 @@ RUN \ curl \ tzdata && \ if [ -z ${HAPROXY_VERSION+x} ]; then \ - HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:haproxy$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4668fe2..c1a92c0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/alpine:3.22 +FROM docker.io/alpine:2.23 # set version label ARG BUILD_DATE @@ -17,7 +17,7 @@ RUN \ curl \ tzdata && \ if [ -z ${HAPROXY_VERSION+x} ]; then \ - HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:haproxy$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index 4668fe2..c1a92c0 100644 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/alpine:3.22 +FROM docker.io/alpine:2.23 # set version label ARG BUILD_DATE @@ -17,7 +17,7 @@ RUN \ curl \ tzdata && \ if [ -z ${HAPROXY_VERSION+x} ]; then \ - HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:haproxy$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Jenkinsfile b/Jenkinsfile index 5ea705d..1aece90 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/socket-proxy' PR_DOCKERHUB_IMAGE = 'lspipepr/socket-proxy' DIST_IMAGE = 'alpine' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v2.23/main/' DIST_REPO_PACKAGES = 'haproxy' MULTIARCH='true' CI='true' diff --git a/README.md b/README.md index 3bfa0c1..a7d6363 100644 --- a/README.md +++ b/README.md @@ -319,6 +319,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.12.25:** - Rebase to Alpine 3.23. * **19.08.25:** - Add tzdata for localised logging timestamps. * **03.06.25:** - Rebase to Alpine 3.22. Add RISCV support. * **08.04.25:** - Add `LOG_LEVEL` back. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 2e480a1..c41d7c5 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,7 +16,7 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/socket-proxy' - PR_DOCKERHUB_IMAGE = 'lspipepr/socket-proxy' - DIST_IMAGE = 'alpine' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.22/main/' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v2.23/main/' - DIST_REPO_PACKAGES = 'haproxy' - MULTIARCH='true' - CI='true' diff --git a/readme-vars.yml b/readme-vars.yml index 018e813..417a180 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -326,6 +326,7 @@ full_custom_readme: | ## Versions + * **26.12.25:** - Rebase to Alpine 3.23. * **19.08.25:** - Add tzdata for localised logging timestamps. * **03.06.25:** - Rebase to Alpine 3.22. Add RISCV support. * **08.04.25:** - Add `LOG_LEVEL` back. From 95176795dbb3bcbcdca8dca9c5fbb4c4abe55cde Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 26 Dec 2025 15:02:37 +0000 Subject: [PATCH 2/2] Use correct version --- .github/workflows/external_trigger.yml | 4 ++-- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.riscv64 | 4 ++-- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index a6864f1..a24ced5 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 main branch. To disable this trigger, add \`socket-proxy_main\` 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/v2.23/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:'"haproxy"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY if grep -q "^socket-proxy_main_${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/v2.23/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"haproxy"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]] || [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/riscv64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"haproxy"'$/,/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:'"haproxy"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]] || [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/riscv64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"haproxy"'$/,/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 socket-proxy 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 c1a92c0..7e873fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/alpine:2.23 +FROM docker.io/alpine:3.23 # set version label ARG BUILD_DATE @@ -17,7 +17,7 @@ RUN \ curl \ tzdata && \ if [ -z ${HAPROXY_VERSION+x} ]; then \ - HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:haproxy$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c1a92c0..7e873fa 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/alpine:2.23 +FROM docker.io/alpine:3.23 # set version label ARG BUILD_DATE @@ -17,7 +17,7 @@ RUN \ curl \ tzdata && \ if [ -z ${HAPROXY_VERSION+x} ]; then \ - HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:haproxy$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index c1a92c0..7e873fa 100644 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/alpine:2.23 +FROM docker.io/alpine:3.23 # set version label ARG BUILD_DATE @@ -17,7 +17,7 @@ RUN \ curl \ tzdata && \ if [ -z ${HAPROXY_VERSION+x} ]; then \ - HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v2.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ + HAPROXY_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \ && awk '/^P:haproxy$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \ fi && \ apk add --no-cache \ diff --git a/Jenkinsfile b/Jenkinsfile index 1aece90..b1f0f45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { DEV_DOCKERHUB_IMAGE = 'lsiodev/socket-proxy' PR_DOCKERHUB_IMAGE = 'lspipepr/socket-proxy' DIST_IMAGE = 'alpine' - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v2.23/main/' + DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/' DIST_REPO_PACKAGES = 'haproxy' MULTIARCH='true' CI='true' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c41d7c5..9d25256 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -16,7 +16,7 @@ repo_vars: - DEV_DOCKERHUB_IMAGE = 'lsiodev/socket-proxy' - PR_DOCKERHUB_IMAGE = 'lspipepr/socket-proxy' - DIST_IMAGE = 'alpine' - - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v2.23/main/' + - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.23/main/' - DIST_REPO_PACKAGES = 'haproxy' - MULTIARCH='true' - CI='true'