Fetch from correct repo

linuxserver · Jul 12, 2023 · 497d1c8 · 497d1c8
1 parent 96811a4
commit 497d1c8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
@@ -20,7 +20,7 @@ jobs:
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NGIRCD_MASTER\". ****"
           echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_NGIRCD_MASTER\`" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"ngircd"'$/,/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.17/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"ngircd"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"ngircd"'$/,/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 ngircd tag latest is detected, however not all arch repos are updated yet. Will try again later."

diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ LABEL maintainer="anoma"
 RUN \
   echo "**** install packages ****" && \
   if [ -z ${NGIRCD_RELEASE+x} ]; then \
-    NGIRCD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    NGIRCD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:ngircd$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -12,7 +12,7 @@ LABEL maintainer="anoma"
 RUN \
   echo "**** install packages ****" && \
   if [ -z ${NGIRCD_RELEASE+x} ]; then \
-    NGIRCD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    NGIRCD_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:ngircd$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -26,8 +26,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/ngircd'
     PR_DOCKERHUB_IMAGE = 'lspipepr/ngircd'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.17'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/'
+    DIST_TAG = '3.18'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
     DIST_REPO_PACKAGES = 'ngircd'
     MULTIARCH='true'
     CI='true'

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -16,8 +16,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/ngircd'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/ngircd'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.17'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.17/main/'
+  - DIST_TAG = '3.18'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
   - DIST_REPO_PACKAGES = 'ngircd'
   - MULTIARCH='true'
   - CI='true'