Skip to content

Commit a27e48c

Browse files
authored
Merge pull request #292 from linuxserver/codeberg
Switch upstream to codeberg, add sponsor links
2 parents 25a0a9e + 6f623f7 commit a27e48c

9 files changed

Lines changed: 34 additions & 40 deletions

File tree

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
github: linuxserver
22
open_collective: linuxserver
3+
custom: ["https://www.bookstackapp.com/donate/",]

.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 master branch. To disable this trigger, add \`bookstack_master\` 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/bookstackapp/bookstack/releases/latest" | jq -r '. | .tag_name')
33-
echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
32+
EXT_RELEASE=$(curl -sX GET 'https://codeberg.org/api/v1/repos/bookstack/bookstack/releases/latest' | jq -r '.tag_name')
33+
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^bookstack_master_${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

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ RUN \
3535
mkdir -p\
3636
/app/www && \
3737
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
38-
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
39-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
38+
BOOKSTACK_RELEASE=$(curl -sX GET "https://codeberg.org/api/v1/repos/bookstack/bookstack/releases/latest" \
39+
| jq -r '.tag_name'); \
4040
fi && \
4141
curl -o \
4242
/tmp/bookstack.tar.gz -L \
43-
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
43+
"https://codeberg.org/bookstack/bookstack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
4444
tar xf \
4545
/tmp/bookstack.tar.gz -C \
4646
/app/www/ --strip-components=1 && \

Dockerfile.aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ RUN \
3535
mkdir -p\
3636
/app/www && \
3737
if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
38-
BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
39-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
38+
BOOKSTACK_RELEASE=$(curl -sX GET "https://codeberg.org/api/v1/repos/bookstack/bookstack/releases/latest" \
39+
| jq -r '.tag_name'); \
4040
fi && \
4141
curl -o \
4242
/tmp/bookstack.tar.gz -L \
43-
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
43+
"https://codeberg.org/bookstack/bookstack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
4444
tar xf \
4545
/tmp/bookstack.tar.gz -C \
4646
/app/www/ --strip-components=1 && \

Jenkinsfile

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ pipeline {
1919
DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
2020
QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
2121
GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
22-
EXT_GIT_BRANCH = 'master'
23-
EXT_USER = 'bookstackapp'
24-
EXT_REPO = 'bookstack'
2522
BUILD_VERSION_ARG = 'BOOKSTACK_RELEASE'
2623
LS_USER = 'linuxserver'
2724
LS_REPO = 'docker-bookstack'
@@ -97,7 +94,7 @@ pipeline {
9794
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
9895
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
9996
env.PULL_REQUEST = env.CHANGE_ID
100-
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
97+
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./root/donate.txt'
10198
if ( env.SYFT_IMAGE_TAG == null ) {
10299
env.SYFT_IMAGE_TAG = 'latest'
103100
}
@@ -146,23 +143,16 @@ pipeline {
146143
/* ########################
147144
External Release Tagging
148145
######################## */
149-
// If this is a stable github release use the latest endpoint from github to determine the ext tag
150-
stage("Set ENV github_stable"){
151-
steps{
152-
script{
153-
env.EXT_RELEASE = sh(
154-
script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
155-
returnStdout: true).trim()
156-
}
157-
}
158-
}
159-
// If this is a stable or devel github release generate the link for the build message
160-
stage("Set ENV github_link"){
161-
steps{
162-
script{
163-
env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
164-
}
165-
}
146+
// If this is a custom command to determine version use that command
147+
stage("Set tag custom bash"){
148+
steps{
149+
script{
150+
env.EXT_RELEASE = sh(
151+
script: ''' curl -sX GET 'https://codeberg.org/api/v1/repos/bookstack/bookstack/releases/latest' | jq -r '.tag_name' ''',
152+
returnStdout: true).trim()
153+
env.RELEASE_LINK = 'custom_command'
154+
}
155+
}
166156
}
167157
// Sanitize the release tag and strip illegal docker or github characters
168158
stage("Sanitize tag"){
@@ -603,7 +593,7 @@ pipeline {
603593
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
604594
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
605595
--label \"org.opencontainers.image.title=Bookstack\" \
606-
--label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \
596+
--label \"org.opencontainers.image.description=[Bookstack](https://codeberg.org/bookstack/bookstack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \
607597
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
608598
--provenance=true --sbom=true --builder=container --load \
609599
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
@@ -672,7 +662,7 @@ pipeline {
672662
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
673663
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
674664
--label \"org.opencontainers.image.title=Bookstack\" \
675-
--label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \
665+
--label \"org.opencontainers.image.description=[Bookstack](https://codeberg.org/bookstack/bookstack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \
676666
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
677667
--provenance=true --sbom=true --builder=container --load \
678668
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
@@ -734,7 +724,7 @@ pipeline {
734724
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
735725
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
736726
--label \"org.opencontainers.image.title=Bookstack\" \
737-
--label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \
727+
--label \"org.opencontainers.image.description=[Bookstack](https://codeberg.org/bookstack/bookstack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \
738728
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
739729
--provenance=true --sbom=true --builder=container --load \
740730
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
@@ -1032,7 +1022,7 @@ pipeline {
10321022
"type": "commit",\
10331023
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
10341024
echo "Pushing New release for Tag"
1035-
curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json
1025+
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
10361026
jq -n \
10371027
--arg tag_name "$META_TAG" \
10381028
--arg target_commitish "master" \

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ Find us at:
3636
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack)
3737
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/)
3838

39-
[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease.
39+
[Bookstack](https://codeberg.org/bookstack/bookstack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease.
4040

4141
Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore.
4242

4343
For more information on BookStack visit their website and check it out: https://www.bookstackapp.com
4444

45-
[![bookstack](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bookstack-logo.png)](https://github.com/BookStackApp/BookStack)
45+
[![bookstack](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bookstack-logo.png)](https://codeberg.org/bookstack/bookstack)
4646

4747
## Supported Architectures
4848

@@ -343,6 +343,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
343343

344344
## Versions
345345

346+
* **29.04.26:** - Switch to pulling release from [Codeberg](https://codeberg.org/bookstack/bookstack).
346347
* **28.12.25:** - Rebase to Alpine 3.23.
347348
* **05.07.25:** - Rebase to Alpine 3.22.
348349
* **04.01.25:** - Add php-opcache.

jenkins-vars.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
# jenkins variables
44
project_name: docker-bookstack
5-
external_type: github_stable
5+
external_type: na
6+
custom_version_command: "curl -sX GET 'https://codeberg.org/api/v1/repos/bookstack/bookstack/releases/latest' | jq -r '.tag_name'"
67
release_type: stable
78
release_tag: latest
89
ls_branch: master
910
repo_vars:
10-
- EXT_GIT_BRANCH = 'master'
11-
- EXT_USER = 'bookstackapp'
12-
- EXT_REPO = 'bookstack'
1311
- BUILD_VERSION_ARG = 'BOOKSTACK_RELEASE'
1412
- LS_USER = 'linuxserver'
1513
- LS_REPO = 'docker-bookstack'
@@ -27,3 +25,5 @@ repo_vars:
2725
- CI_DOCKERENV=''
2826
- CI_AUTH = ''
2927
- CI_WEBPATH = ''
28+
sponsor_links:
29+
- { name: "Bookstack", url: "https://www.bookstackapp.com/donate/" }

readme-vars.yml

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

33
# project information
44
project_name: bookstack
5-
project_url: "https://github.com/BookStackApp/BookStack"
5+
project_url: "https://codeberg.org/bookstack/bookstack"
66
project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bookstack-logo.png"
77
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
88
project_categories: "Content Management"
@@ -136,6 +136,7 @@ init_diagram: |
136136
"bookstack:latest" <- Base Images
137137
# changelog
138138
changelogs:
139+
- {date: "29.04.26:", desc: "Switch to pulling releases from [Codeberg](https://codeberg.org/bookstack/bookstack)."}
139140
- {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
140141
- {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
141142
- {date: "04.01.25:", desc: "Add php-opcache."}

root/donate.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bookstack: https://www.bookstackapp.com/donate/

0 commit comments

Comments
 (0)