Skip to content

Commit 08d0843

Browse files
thespadthespad
committed
Merge branch 'main' into v2
2 parents fac9965 + ba83d35 commit 08d0843

5 files changed

Lines changed: 35 additions & 39 deletions

File tree

‎.github/workflows/external_trigger.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
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
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
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')
33-
echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
32+
EXT_RELEASE=$(echo v1.26.3)
33+
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^planka_main_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3636
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY

‎Jenkinsfile‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,23 +145,16 @@ pipeline {
145145
/* ########################
146146
External Release Tagging
147147
######################## */
148-
// If this is a stable github release use the latest endpoint from github to determine the ext tag
149-
stage("Set ENV github_stable"){
150-
steps{
151-
script{
152-
env.EXT_RELEASE = sh(
153-
script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
154-
returnStdout: true).trim()
155-
}
156-
}
157-
}
158-
// If this is a stable or devel github release generate the link for the build message
159-
stage("Set ENV github_link"){
160-
steps{
161-
script{
162-
env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
163-
}
164-
}
148+
// If this is a custom command to determine version use that command
149+
stage("Set tag custom bash"){
150+
steps{
151+
script{
152+
env.EXT_RELEASE = sh(
153+
script: ''' echo v1.26.3 ''',
154+
returnStdout: true).trim()
155+
env.RELEASE_LINK = 'custom_command'
156+
}
157+
}
165158
}
166159
// Sanitize the release tag and strip illegal docker or github characters
167160
stage("Sanitize tag"){
@@ -1030,7 +1023,7 @@ pipeline {
10301023
"type": "commit",\
10311024
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
10321025
echo "Pushing New release for Tag"
1033-
curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json
1026+
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
10341027
jq -n \
10351028
--arg tag_name "$META_TAG" \
10361029
--arg target_commitish "main" \

‎jenkins-vars.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
# jenkins variables
44
project_name: docker-planka
5-
external_type: github_stable
5+
external_type: na
6+
custom_version_command: "echo v1.26.3"
67
release_type: stable
78
release_tag: latest
89
ls_branch: main

‎package_versions.txt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ agent-base 6.0.2 npm
120120
alpine-baselayout 3.6.8-r1 apk
121121
alpine-baselayout-data 3.6.8-r1 apk
122122
alpine-keys 2.5-r0 apk
123-
alpine-release 3.21.3-r0 apk
123+
alpine-release 3.21.6-r0 apk
124124
anchor 1.4.1 npm
125125
ansi-regex 5.0.1 npm
126126
ansi-regex 6.1.0 npm
@@ -152,13 +152,13 @@ brotli-libs 1.1.0-r2 apk
152152
browser_field UNKNOWN npm
153153
buffer-equal-constant-time 1.0.1 npm
154154
buffer-writer 2.0.0 npm
155-
busybox 1.37.0-r12 apk
156-
busybox-binsh 1.37.0-r12 apk
155+
busybox 1.37.0-r14 apk
156+
busybox-binsh 1.37.0-r14 apk
157157
bytes 3.0.0 npm
158158
bytes 3.1.2 npm
159-
c-ares 1.34.5-r0 apk
160-
ca-certificates 20241121-r1 apk
161-
ca-certificates-bundle 20241121-r1 apk
159+
c-ares 1.34.6-r0 apk
160+
ca-certificates 20250911-r0 apk
161+
ca-certificates-bundle 20250911-r0 apk
162162
call-bind 1.0.7 npm
163163
camelcase 1.2.1 npm
164164
captains-log 2.0.5 npm
@@ -203,7 +203,7 @@ coreutils-sha512sum 9.5-r2 apk
203203
cors 2.8.5 npm
204204
cross-spawn 7.0.6 npm
205205
csrf 3.1.0 npm
206-
curl 8.12.1-r1 apk
206+
curl 8.14.1-r2 apk
207207
cycle 1.0.3 npm
208208
debug 2.6.9 npm
209209
debug 3.1.0 npm
@@ -287,8 +287,8 @@ http-errors 2.0.0 npm
287287
https-proxy-agent 5.0.1 npm
288288
i18n-2 0.7.3 npm
289289
iconv-lite 0.4.24 npm
290-
icu-data-en 74.2-r0 apk
291-
icu-libs 74.2-r0 apk
290+
icu-data-en 74.2-r1 apk
291+
icu-libs 74.2-r1 apk
292292
include-all 4.0.3 npm
293293
inflight 1.0.6 npm
294294
inherits 2.0.4 npm
@@ -320,17 +320,17 @@ knex 3.1.0 npm
320320
kuler 2.0.0 npm
321321
libattr 2.5.2-r2 apk
322322
libbsd 0.12.2-r0 apk
323-
libcrypto3 3.3.3-r0 apk
324-
libcurl 8.12.1-r1 apk
323+
libcrypto3 3.3.6-r0 apk
324+
libcurl 8.14.1-r2 apk
325325
libgcc 14.2.0-r4 apk
326326
libidn2 2.3.7-r0 apk
327327
libintl 0.22.5-r0 apk
328328
libmd 1.1.0-r0 apk
329329
libncursesw 6.5_p20241006-r3 apk
330-
libpq 17.4-r0 apk
330+
libpq 17.7-r0 apk
331331
libproc2 4.0.4-r2 apk
332332
libpsl 0.21.5-r3 apk
333-
libssl3 3.3.3-r0 apk
333+
libssl3 3.3.6-r0 apk
334334
libstdc++ 14.2.0-r4 apk
335335
libunistring 1.2-r0 apk
336336
linux-pam 1.6.1-r1 apk
@@ -394,7 +394,7 @@ netcat-openbsd 1.226.1.1-r0 apk
394394
nghttp2-libs 1.64.0-r0 apk
395395
node-addon-api 5.1.0 npm
396396
node-fetch 2.7.0 npm
397-
nodejs 22.13.1-r0 apk
397+
nodejs 22.15.1-r0 apk
398398
nodemailer 6.9.16 npm
399399
nopt 5.0.0 npm
400400
npmlog 5.0.1 npm
@@ -440,7 +440,7 @@ postgres-bytea 1.0.0 npm
440440
postgres-date 1.0.7 npm
441441
postgres-interval 1.2.0 npm
442442
postgresql-common 1.2-r1 apk
443-
postgresql16-client 16.8-r0 apk
443+
postgresql16-client 16.11-r0 apk
444444
procps-ng 4.0.4-r2 apk
445445
promise 5.0.0 npm
446446
prompt 1.2.1 npm
@@ -513,8 +513,8 @@ socket.io-parser 4.2.4 npm
513513
sort-route-addresses 0.0.4 npm
514514
split2 4.2.0 npm
515515
sprintf-js 1.1.3 npm
516-
sqlite-libs 3.48.0-r2 apk
517-
ssl_client 1.37.0-r12 apk
516+
sqlite-libs 3.48.0-r4 apk
517+
ssl_client 1.37.0-r14 apk
518518
stack-trace 0.0.10 npm
519519
statuses 1.3.1 npm
520520
statuses 1.5.0 npm
@@ -545,7 +545,7 @@ triple-beam 1.4.1 npm
545545
tslib 2.8.1 npm
546546
tsscmp 1.0.6 npm
547547
type-is 1.6.18 npm
548-
tzdata 2025b-r0 apk
548+
tzdata 2025c-r0 apk
549549
uid-safe 2.1.5 npm
550550
uid2 0.0.3 npm
551551
underscore 1.13.1 npm

‎readme-vars.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,14 @@ init_diagram: |
7373
init-planka-config -> init-config-end
7474
init-config -> init-crontab-config
7575
init-mods-end -> init-custom-files
76+
init-adduser -> init-device-perms
7677
base -> init-envfile
7778
base -> init-migrations
7879
init-config-end -> init-mods
7980
init-mods-package-install -> init-mods-end
8081
init-mods -> init-mods-package-install
8182
init-adduser -> init-os-end
83+
init-device-perms -> init-os-end
8284
init-envfile -> init-os-end
8385
init-config -> init-planka-config
8486
init-custom-files -> init-services

0 commit comments

Comments
 (0)