Skip to content

Commit 1b6f898

Browse files
thespadthespad
authored
Merge pull request #271 from linuxserver/demaster
2 parents fadd6eb + d356a69 commit 1b6f898

7 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎.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-alpine/edit/master/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-alpine/edit/3.22/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-alpine/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-alpine/tree/3.22/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-alpine/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-alpine/blob/3.22/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

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

‎.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-3-22:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4.1.1
1414

1515
- name: External Trigger
16-
if: github.ref == 'refs/heads/master'
16+
if: github.ref == 'refs/heads/3.22'
1717
env:
1818
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1919
run: |
2020
printf "# External trigger for docker-baseimage-alpine\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-alpine_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
24+
if grep -q "^baseimage-alpine_3.22_${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-alpine/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-alpine/blob/3.22/.github/PULL_REQUEST_TEMPLATE.md)!'
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎Jenkinsfile‎

Lines changed: 31 additions & 31 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 3.22 build use live docker endpoints
189189
stage("Set ENV live build"){
190190
when {
191-
branch "master"
191+
branch "3.22"
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 "3.22"}
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 "3.22"
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 3.22 of ${LS_USER}/${LS_REPO} for running the jenkins builder on
306+
# ${TEMPDIR}/repo/${LS_REPO}: Cloned branch 3.22 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 3.22 --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 3.22
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 3.22
322+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git 3.22
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 3.22
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 3.22
347+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git 3.22
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 3.22
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 3.22
377+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git 3.22
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 "3.22"
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 3.22 build check the S6 service file perms
458458
stage("Check S6 Service file Permissions"){
459459
when {
460-
branch "master"
460+
branch "3.22"
461461
environment name: 'CHANGE_ID', value: ''
462462
environment name: 'EXIT_STATUS', value: ''
463463
}
@@ -765,7 +765,7 @@ pipeline {
765765
// Take the image we just built and dump package versions for comparison
766766
stage('Update-packages') {
767767
when {
768-
branch "master"
768+
branch "3.22"
769769
environment name: 'CHANGE_ID', value: ''
770770
environment name: 'EXIT_STATUS', value: ''
771771
}
@@ -788,14 +788,14 @@ pipeline {
788788
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
789789
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
790790
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
791-
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
791+
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f 3.22
792792
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
793793
cd ${TEMPDIR}/${LS_REPO}/
794794
wait
795795
git add package_versions.txt
796796
git commit -m 'Bot Updating Package Versions'
797-
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
798-
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
797+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git 3.22
798+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git 3.22
799799
echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
800800
echo "Package tag updated, stopping build process"
801801
else
@@ -813,7 +813,7 @@ pipeline {
813813
// Exit the build if the package file was just updated
814814
stage('PACKAGE-exit') {
815815
when {
816-
branch "master"
816+
branch "3.22"
817817
environment name: 'CHANGE_ID', value: ''
818818
environment name: 'PACKAGE_UPDATED', value: 'true'
819819
environment name: 'EXIT_STATUS', value: ''
@@ -827,7 +827,7 @@ pipeline {
827827
// Exit the build if this is just a package check and there are no changes to push
828828
stage('PACKAGECHECK-exit') {
829829
when {
830-
branch "master"
830+
branch "3.22"
831831
environment name: 'CHANGE_ID', value: ''
832832
environment name: 'PACKAGE_UPDATED', value: 'false'
833833
environment name: 'EXIT_STATUS', value: ''
@@ -973,7 +973,7 @@ pipeline {
973973
// If this is a public release tag it in the LS Github
974974
stage('Github-Tag-Push-Release') {
975975
when {
976-
branch "master"
976+
branch "3.22"
977977
expression {
978978
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
979979
}
@@ -985,14 +985,14 @@ pipeline {
985985
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
986986
-d '{"tag":"'${META_TAG}'",\
987987
"object": "'${COMMIT_SHA}'",\
988-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
988+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to 3.22",\
989989
"type": "commit",\
990990
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
991991
echo "Pushing New release for Tag"
992992
sh '''#! /bin/bash
993993
echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
994994
echo '{"tag_name":"'${META_TAG}'",\
995-
"target_commitish": "master",\
995+
"target_commitish": "3.22",\
996996
"name": "'${META_TAG}'",\
997997
"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
998998
printf '","draft": false,"prerelease": false}' >> releasebody.json
@@ -1003,14 +1003,14 @@ pipeline {
10031003
// Add protection to the release branch
10041004
stage('Github-Release-Branch-Protection') {
10051005
when {
1006-
branch "master"
1006+
branch "3.22"
10071007
environment name: 'CHANGE_ID', value: ''
10081008
environment name: 'EXIT_STATUS', value: ''
10091009
}
10101010
steps {
1011-
echo "Setting up protection for release branch master"
1011+
echo "Setting up protection for release branch 3.22"
10121012
sh '''#! /bin/bash
1013-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
1013+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/3.22/protection \
10141014
-d $(jq -c . << EOF
10151015
{
10161016
"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-alpine/blob/master/.github/CONTRIBUTING.md -->
2+
<!-- Please read https://github.com/linuxserver/docker-baseimage-alpine/blob/3.22/.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project_name: docker-baseimage-alpine
55
external_type: os
66
release_type: stable
77
release_tag: "3.22"
8-
ls_branch: master
8+
ls_branch: "3.22"
99
build_riscv64: true
1010
repo_vars:
1111
- BUILD_VERSION_ARG = 'OS'

0 commit comments

Comments
 (0)