diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 4515863..803f8da 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 3.23 branch. To disable this trigger, add \`baseimage-alpine-nginx_3.23\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php84"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')) + EXT_RELEASE=$(echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php85"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')) echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY if grep -q "^baseimage-alpine-nginx_3.23_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY diff --git a/Jenkinsfile b/Jenkinsfile index cb00f17..da23458 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -147,7 +147,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php84"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') ''', + script: ''' echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php85"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 33449d9..7c4f74b 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-baseimage-alpine-nginx external_type: na -custom_version_command: "echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'\"nginx\"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'\"php84\"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')" +custom_version_command: "echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'\"nginx\"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'\"php85\"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')" release_type: stable release_tag: "3.23" ls_branch: "3.23"