diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 1e792d0..366012b 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -29,8 +29,8 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of main branch. To disable this trigger, add \`planka_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 -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/plankanban/planka/releases/latest" | jq -r '. | .tag_name') - echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY + EXT_RELEASE=$(echo v1.26.3) + echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY if grep -q "^planka_main_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY diff --git a/Jenkinsfile b/Jenkinsfile index ad1d865..4df7f61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -145,23 +145,16 @@ pipeline { /* ######################## External Release Tagging ######################## */ - // If this is a stable github release use the latest endpoint from github to determine the ext tag - stage("Set ENV github_stable"){ - steps{ - script{ - env.EXT_RELEASE = sh( - script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', - returnStdout: true).trim() - } - } - } - // If this is a stable or devel github release generate the link for the build message - stage("Set ENV github_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE - } - } + // If this is a custom command to determine version use that command + stage("Set tag custom bash"){ + steps{ + script{ + env.EXT_RELEASE = sh( + script: ''' echo v1.26.3 ''', + returnStdout: true).trim() + env.RELEASE_LINK = 'custom_command' + } + } } // Sanitize the release tag and strip illegal docker or github characters stage("Sanitize tag"){ @@ -1030,7 +1023,7 @@ pipeline { "type": "commit",\ "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' echo "Pushing New release for Tag" - curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json + echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json jq -n \ --arg tag_name "$META_TAG" \ --arg target_commitish "main" \ diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 16e30d1..ef04824 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,8 @@ # jenkins variables project_name: docker-planka -external_type: github_stable +external_type: na +custom_version_command: "echo v1.26.3" release_type: stable release_tag: latest ls_branch: main diff --git a/package_versions.txt b/package_versions.txt index 82eae19..e27ff04 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -120,7 +120,7 @@ agent-base 6.0.2 npm alpine-baselayout 3.6.8-r1 apk alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk -alpine-release 3.21.3-r0 apk +alpine-release 3.21.6-r0 apk anchor 1.4.1 npm ansi-regex 5.0.1 npm ansi-regex 6.1.0 npm @@ -152,13 +152,13 @@ brotli-libs 1.1.0-r2 apk browser_field UNKNOWN npm buffer-equal-constant-time 1.0.1 npm buffer-writer 2.0.0 npm -busybox 1.37.0-r12 apk -busybox-binsh 1.37.0-r12 apk +busybox 1.37.0-r14 apk +busybox-binsh 1.37.0-r14 apk bytes 3.0.0 npm bytes 3.1.2 npm -c-ares 1.34.5-r0 apk -ca-certificates 20241121-r1 apk -ca-certificates-bundle 20241121-r1 apk +c-ares 1.34.6-r0 apk +ca-certificates 20250911-r0 apk +ca-certificates-bundle 20250911-r0 apk call-bind 1.0.7 npm camelcase 1.2.1 npm captains-log 2.0.5 npm @@ -203,7 +203,7 @@ coreutils-sha512sum 9.5-r2 apk cors 2.8.5 npm cross-spawn 7.0.6 npm csrf 3.1.0 npm -curl 8.12.1-r1 apk +curl 8.14.1-r2 apk cycle 1.0.3 npm debug 2.6.9 npm debug 3.1.0 npm @@ -287,8 +287,8 @@ http-errors 2.0.0 npm https-proxy-agent 5.0.1 npm i18n-2 0.7.3 npm iconv-lite 0.4.24 npm -icu-data-en 74.2-r0 apk -icu-libs 74.2-r0 apk +icu-data-en 74.2-r1 apk +icu-libs 74.2-r1 apk include-all 4.0.3 npm inflight 1.0.6 npm inherits 2.0.4 npm @@ -320,17 +320,17 @@ knex 3.1.0 npm kuler 2.0.0 npm libattr 2.5.2-r2 apk libbsd 0.12.2-r0 apk -libcrypto3 3.3.3-r0 apk -libcurl 8.12.1-r1 apk +libcrypto3 3.3.6-r0 apk +libcurl 8.14.1-r2 apk libgcc 14.2.0-r4 apk libidn2 2.3.7-r0 apk libintl 0.22.5-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20241006-r3 apk -libpq 17.4-r0 apk +libpq 17.7-r0 apk libproc2 4.0.4-r2 apk libpsl 0.21.5-r3 apk -libssl3 3.3.3-r0 apk +libssl3 3.3.6-r0 apk libstdc++ 14.2.0-r4 apk libunistring 1.2-r0 apk linux-pam 1.6.1-r1 apk @@ -394,7 +394,7 @@ netcat-openbsd 1.226.1.1-r0 apk nghttp2-libs 1.64.0-r0 apk node-addon-api 5.1.0 npm node-fetch 2.7.0 npm -nodejs 22.13.1-r0 apk +nodejs 22.15.1-r0 apk nodemailer 6.9.16 npm nopt 5.0.0 npm npmlog 5.0.1 npm @@ -440,7 +440,7 @@ postgres-bytea 1.0.0 npm postgres-date 1.0.7 npm postgres-interval 1.2.0 npm postgresql-common 1.2-r1 apk -postgresql16-client 16.8-r0 apk +postgresql16-client 16.11-r0 apk procps-ng 4.0.4-r2 apk promise 5.0.0 npm prompt 1.2.1 npm @@ -513,8 +513,8 @@ socket.io-parser 4.2.4 npm sort-route-addresses 0.0.4 npm split2 4.2.0 npm sprintf-js 1.1.3 npm -sqlite-libs 3.48.0-r2 apk -ssl_client 1.37.0-r12 apk +sqlite-libs 3.48.0-r4 apk +ssl_client 1.37.0-r14 apk stack-trace 0.0.10 npm statuses 1.3.1 npm statuses 1.5.0 npm @@ -545,7 +545,7 @@ triple-beam 1.4.1 npm tslib 2.8.1 npm tsscmp 1.0.6 npm type-is 1.6.18 npm -tzdata 2025b-r0 apk +tzdata 2025c-r0 apk uid-safe 2.1.5 npm uid2 0.0.3 npm underscore 1.13.1 npm diff --git a/readme-vars.yml b/readme-vars.yml index 14d6ddc..2a2bb6a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -73,12 +73,14 @@ init_diagram: | init-planka-config -> init-config-end init-config -> init-crontab-config init-mods-end -> init-custom-files + init-adduser -> init-device-perms base -> init-envfile base -> init-migrations init-config-end -> init-mods init-mods-package-install -> init-mods-end init-mods -> init-mods-package-install init-adduser -> init-os-end + init-device-perms -> init-os-end init-envfile -> init-os-end init-config -> init-planka-config init-custom-files -> init-services