Rebase to 3.20

2026-01-20 20:41:46 +08:00 · 2024-05-24 14:58:52 +01:00 · 2024-05-24 14:58:52 +01:00 · c401f44a54
commit c401f44a54
parent 9822873081
8 changed files with 27 additions and 15 deletions
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -20,7 +20,7 @@ jobs:
          echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SOCKET_PROXY_MAIN\". ****"
          echo "External trigger running off of main branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_SOCKET_PROXY_MAIN\`" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
            && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "**** Can't retrieve external version, exiting ****"
@ -74,7 +74,7 @@ jobs:
            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/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.20/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 ****"
            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."
--- a/9
+++ b/9
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM docker.io/alpine:3.19
+FROM docker.io/alpine:3.20

 # set version label
 ARG BUILD_DATE
@ -46,13 +46,14 @@ RUN \
    curl \
    envsubst && \
  if [ -z ${NGINX_VERSION+x} ]; then \
-  NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+  NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/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 \
    nginx==${NGINX_VERSION} && \
-    rm -f /etc/nginx/conf.d/stream.conf && \
-    rm -f /etc/nginx/http.d/default.conf
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
+  rm -f /etc/nginx/http.d/default.conf

 # add local files
 COPY root/ /
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM docker.io/alpine:3.19
+FROM docker.io/alpine:3.20

 # set version label
 ARG BUILD_DATE
@ -46,13 +46,14 @@ RUN \
    curl \
    envsubst && \
  if [ -z ${NGINX_VERSION+x} ]; then \
-  NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+  NGINX_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/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 \
    nginx==${NGINX_VERSION} && \
-    rm -f /etc/nginx/conf.d/stream.conf && \
-    rm -f /etc/nginx/http.d/default.conf
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
+  rm -f /etc/nginx/http.d/default.conf

 # add local files
 COPY root/ /
--- a/7
+++ b/7
@ -25,8 +25,8 @@ pipeline {
    DEV_DOCKERHUB_IMAGE = 'lsiodev/socket-proxy'
    PR_DOCKERHUB_IMAGE = 'lspipepr/socket-proxy'
    DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.19'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
+    DIST_TAG = '3.20'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
    DIST_REPO_PACKAGES = 'nginx'
    MULTIARCH='true'
    CI='false'
@ -495,6 +495,7 @@ pipeline {
          --label \"org.opencontainers.image.title=Socket-proxy\" \
          --label \"org.opencontainers.image.description=socket-proxy image by linuxserver.io\" \
          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --provenance=false --sbom=false \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
@ -526,6 +527,7 @@ pipeline {
              --label \"org.opencontainers.image.title=Socket-proxy\" \
              --label \"org.opencontainers.image.description=socket-proxy image by linuxserver.io\" \
              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --provenance=false --sbom=false \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
@ -554,6 +556,7 @@ pipeline {
              --label \"org.opencontainers.image.title=Socket-proxy\" \
              --label \"org.opencontainers.image.description=socket-proxy image by linuxserver.io\" \
              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=false --sbom=false \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            retry(5) {
--- a/README.md
+++ b/README.md
@ -304,6 +304,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **24.05.24:** - Rebase to Alpine 3.20.
 * **15.04.24:** - Allow disabling IPv6 support for legacy devices.
 * **08.04.24:** - Use nginx due to haproxy's wonky websockets handling.
 * **07.04.24:** - Initial Release.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -16,8 +16,8 @@ repo_vars:
  - DEV_DOCKERHUB_IMAGE = 'lsiodev/socket-proxy'
  - PR_DOCKERHUB_IMAGE = 'lspipepr/socket-proxy'
  - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.19'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
+  - DIST_TAG = '3.20'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
  - DIST_REPO_PACKAGES = 'nginx'
  - MULTIARCH='true'
  - CI='false'
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -308,6 +308,7 @@ full_custom_readme: |

  ## Versions

+  * **24.05.24:** - Rebase to Alpine 3.20.
  * **15.04.24:** - Allow disabling IPv6 support for legacy devices.
  * **08.04.24:** - Use nginx due to haproxy's wonky websockets handling.
  * **07.04.24:** - Initial Release.
--- a/root/docker-entrypoint.sh
+++ b/root/docker-entrypoint.sh
@ -27,8 +27,13 @@ echo '
 To support LSIO projects visit:
 https://www.linuxserver.io/donate/

+───────────────────────────────────────'
+if [[ -f /build_version ]]; then
+    cat /build_version
+    echo '
 ───────────────────────────────────────
-'
+    '
+fi

 echo "[ls.io-init] done."