Skip to content

Commit 6f62539

Browse files
authored
Merge pull request #195 from linuxserver/3.23-php-version
fix php version tag
2 parents 1cd2e58 + 82ae401 commit 6f62539

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
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
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
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://'))
32+
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://'))
3333
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^baseimage-alpine-nginx_3.23_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pipeline {
147147
steps{
148148
script{
149149
env.EXT_RELEASE = sh(
150-
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://') ''',
150+
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://') ''',
151151
returnStdout: true).trim()
152152
env.RELEASE_LINK = 'custom_command'
153153
}

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: docker-baseimage-alpine-nginx
55
external_type: na
6-
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://')"
6+
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://')"
77
release_type: stable
88
release_tag: "3.23"
99
ls_branch: "3.23"

0 commit comments

Comments
 (0)