Skip to content

Commit b4a08f1

Browse files
thelamerthelamer
committed
bookworm branch
1 parent 7cd7ef0 commit b4a08f1

File tree

9 files changed

+42
-42
lines changed

9 files changed

+42
-42
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
## Readme
2525

2626
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27-
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-debian/edit/master/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-debian/edit/bookworm/readme-vars.yml).
2828

2929
These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
3030
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
115115

116116
## Update the changelog
117117

118-
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-baseimage-debian/tree/master/root), add an entry to the changelog
118+
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-baseimage-debian/tree/bookworm/root), add an entry to the changelog
119119

120120
```yml
121121
changelogs:

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
------------------------------
2323

24-
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-debian/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-debian/blob/bookworm/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

2626
------------------------------
2727

‎.github/workflows/call_issue_pr_tracker.yml‎

100755100644
File mode changed.

‎.github/workflows/call_issues_cron.yml‎

100755100644
File mode changed.

‎.github/workflows/external_trigger.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ permissions:
77
contents: read
88

99
jobs:
10-
external-trigger-master:
10+
external-trigger-bookworm:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/[email protected]
1414

1515
- name: External Trigger
16-
if: github.ref == 'refs/heads/master'
16+
if: github.ref == 'refs/heads/bookworm'
1717
env:
1818
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1919
run: |
2020
printf "# External trigger for docker-baseimage-debian\n\n" >> $GITHUB_STEP_SUMMARY
2121
echo "Type is \`os\`" >> $GITHUB_STEP_SUMMARY
2222
echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY
2323
exit 0
24-
if grep -q "^baseimage-debian_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
24+
if grep -q "^baseimage-debian_bookworm_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2525
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
2626
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
2727
exit 0

‎.github/workflows/greetings.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- uses: actions/first-interaction@v1
1616
with:
1717
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
18-
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-debian/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
18+
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-debian/blob/bookworm/.github/PULL_REQUEST_TEMPLATE.md)!'
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎Jenkinsfile‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ pipeline {
185185
}
186186
}
187187
}
188-
// If this is a master build use live docker endpoints
188+
// If this is a bookworm build use live docker endpoints
189189
stage("Set ENV live build"){
190190
when {
191-
branch "master"
191+
branch "bookworm"
192192
environment name: 'CHANGE_ID', value: ''
193193
}
194194
steps {
@@ -212,7 +212,7 @@ pipeline {
212212
// If this is a dev build use dev docker endpoints
213213
stage("Set ENV dev build"){
214214
when {
215-
not {branch "master"}
215+
not {branch "bookworm"}
216216
environment name: 'CHANGE_ID', value: ''
217217
}
218218
steps {
@@ -290,7 +290,7 @@ pipeline {
290290
// Use helper containers to render templated files
291291
stage('Update-Templates') {
292292
when {
293-
branch "master"
293+
branch "bookworm"
294294
environment name: 'CHANGE_ID', value: ''
295295
expression {
296296
env.CONTAINER_NAME != null
@@ -302,24 +302,24 @@ pipeline {
302302
TEMPDIR=$(mktemp -d)
303303
docker pull ghcr.io/linuxserver/jenkins-builder:latest
304304
# Cloned repo paths for templating:
305-
# ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
306-
# ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
305+
# ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch bookworm of ${LS_USER}/${LS_REPO} for running the jenkins builder on
306+
# ${TEMPDIR}/repo/${LS_REPO}: Cloned branch bookworm of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
307307
# ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
308308
# ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
309309
# ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
310-
git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
310+
git clone --branch bookworm --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
311311
docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest
312312
echo "Starting Stage 1 - Jenkinsfile update"
313313
if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
314314
mkdir -p ${TEMPDIR}/repo
315315
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
316316
cd ${TEMPDIR}/repo/${LS_REPO}
317-
git checkout -f master
317+
git checkout -f bookworm
318318
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
319319
git add Jenkinsfile
320320
git commit -m 'Bot Updating Templated Files'
321-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
322-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
321+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
322+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
323323
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
324324
echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
325325
rm -Rf ${TEMPDIR}
@@ -338,13 +338,13 @@ pipeline {
338338
mkdir -p ${TEMPDIR}/repo
339339
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
340340
cd ${TEMPDIR}/repo/${LS_REPO}
341-
git checkout -f master
341+
git checkout -f bookworm
342342
for i in ${TEMPLATES_TO_DELETE}; do
343343
git rm "${i}"
344344
done
345345
git commit -m 'Bot Updating Templated Files'
346-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
347-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
346+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
347+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
348348
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
349349
echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
350350
rm -Rf ${TEMPDIR}
@@ -360,7 +360,7 @@ pipeline {
360360
mkdir -p ${TEMPDIR}/repo
361361
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
362362
cd ${TEMPDIR}/repo/${LS_REPO}
363-
git checkout -f master
363+
git checkout -f bookworm
364364
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
365365
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
366366
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -373,8 +373,8 @@ pipeline {
373373
fi
374374
git add readme-vars.yml ${TEMPLATED_FILES}
375375
git commit -m 'Bot Updating Templated Files'
376-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
377-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
376+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
377+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
378378
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
379379
echo "Updating templates and exiting build, new one will trigger based on commit"
380380
rm -Rf ${TEMPDIR}
@@ -441,7 +441,7 @@ pipeline {
441441
// Exit the build if the Templated files were just updated
442442
stage('Template-exit') {
443443
when {
444-
branch "master"
444+
branch "bookworm"
445445
environment name: 'CHANGE_ID', value: ''
446446
environment name: 'FILES_UPDATED', value: 'true'
447447
expression {
@@ -454,10 +454,10 @@ pipeline {
454454
}
455455
}
456456
}
457-
// If this is a master build check the S6 service file perms
457+
// If this is a bookworm build check the S6 service file perms
458458
stage("Check S6 Service file Permissions"){
459459
when {
460-
branch "master"
460+
branch "bookworm"
461461
environment name: 'CHANGE_ID', value: ''
462462
environment name: 'EXIT_STATUS', value: ''
463463
}
@@ -699,7 +699,7 @@ pipeline {
699699
// Take the image we just built and dump package versions for comparison
700700
stage('Update-packages') {
701701
when {
702-
branch "master"
702+
branch "bookworm"
703703
environment name: 'CHANGE_ID', value: ''
704704
environment name: 'EXIT_STATUS', value: ''
705705
}
@@ -722,14 +722,14 @@ pipeline {
722722
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
723723
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
724724
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
725-
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
725+
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f bookworm
726726
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
727727
cd ${TEMPDIR}/${LS_REPO}/
728728
wait
729729
git add package_versions.txt
730730
git commit -m 'Bot Updating Package Versions'
731-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
732-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
731+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
732+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git bookworm
733733
echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
734734
echo "Package tag updated, stopping build process"
735735
else
@@ -747,7 +747,7 @@ pipeline {
747747
// Exit the build if the package file was just updated
748748
stage('PACKAGE-exit') {
749749
when {
750-
branch "master"
750+
branch "bookworm"
751751
environment name: 'CHANGE_ID', value: ''
752752
environment name: 'PACKAGE_UPDATED', value: 'true'
753753
environment name: 'EXIT_STATUS', value: ''
@@ -761,7 +761,7 @@ pipeline {
761761
// Exit the build if this is just a package check and there are no changes to push
762762
stage('PACKAGECHECK-exit') {
763763
when {
764-
branch "master"
764+
branch "bookworm"
765765
environment name: 'CHANGE_ID', value: ''
766766
environment name: 'PACKAGE_UPDATED', value: 'false'
767767
environment name: 'EXIT_STATUS', value: ''
@@ -903,7 +903,7 @@ pipeline {
903903
// If this is a public release tag it in the LS Github
904904
stage('Github-Tag-Push-Release') {
905905
when {
906-
branch "master"
906+
branch "bookworm"
907907
expression {
908908
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
909909
}
@@ -915,32 +915,32 @@ pipeline {
915915
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
916916
-d '{"tag":"'${META_TAG}'",\
917917
"object": "'${COMMIT_SHA}'",\
918-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
918+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to bookworm",\
919919
"type": "commit",\
920920
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}' '''
921921
echo "Pushing New release for Tag"
922922
sh '''#! /bin/bash
923923
echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
924924
echo '{"tag_name":"'${META_TAG}'",\
925-
"target_commitish": "master",\
925+
"target_commitish": "bookworm",\
926926
"name": "'${META_TAG}'",\
927927
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
928-
printf '","draft": false,"prerelease": false}' >> releasebody.json
928+
printf '","draft": false,"prerelease": true}' >> releasebody.json
929929
paste -d'\\0' start releasebody.json > releasebody.json.done
930930
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
931931
}
932932
}
933933
// Add protection to the release branch
934934
stage('Github-Release-Branch-Protection') {
935935
when {
936-
branch "master"
936+
branch "bookworm"
937937
environment name: 'CHANGE_ID', value: ''
938938
environment name: 'EXIT_STATUS', value: ''
939939
}
940940
steps {
941-
echo "Setting up protection for release branch master"
941+
echo "Setting up protection for release branch bookworm"
942942
sh '''#! /bin/bash
943-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
943+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/bookworm/protection \
944944
-d $(jq -c . << EOF
945945
{
946946
"required_status_checks": null,

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- DO NOT EDIT THIS FILE MANUALLY -->
2-
<!-- Please read https://github.com/linuxserver/docker-baseimage-debian/blob/master/.github/CONTRIBUTING.md -->
2+
<!-- Please read https://github.com/linuxserver/docker-baseimage-debian/blob/bookworm/.github/CONTRIBUTING.md -->
33
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
44

55
## Contact information:-

‎jenkins-vars.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# jenkins variables
44
project_name: docker-baseimage-debian
55
external_type: os
6-
release_type: stable
6+
release_type: prerelease
77
release_tag: bookworm
8-
ls_branch: master
8+
ls_branch: bookworm
99
image_sbom: true
1010
image_provenance: true
1111
repo_vars:

0 commit comments

Comments
 (0)