Skip to content

Commit 602352e

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent e73081a commit 602352e

File tree

2 files changed

+39
-54
lines changed

2 files changed

+39
-54
lines changed

‎Jenkinsfile

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ pipeline {
138138
steps {
139139
script{
140140
env.IMAGE = env.DOCKERHUB_IMAGE
141-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
142141
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
143142
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
144143
if (env.MULTIARCH == 'true') {
@@ -159,7 +158,6 @@ pipeline {
159158
steps {
160159
script{
161160
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
162-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
163161
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
164162
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
165163
if (env.MULTIARCH == 'true') {
@@ -180,7 +178,6 @@ pipeline {
180178
steps {
181179
script{
182180
env.IMAGE = env.PR_DOCKERHUB_IMAGE
183-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
184181
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
185182
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
186183
if (env.MULTIARCH == 'true') {
@@ -545,22 +542,15 @@ pipeline {
545542
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
546543
usernameVariable: 'DOCKERUSER',
547544
passwordVariable: 'DOCKERPASS'
548-
],
549-
[
550-
$class: 'UsernamePasswordMultiBinding',
551-
credentialsId: 'Quay.io-Robot',
552-
usernameVariable: 'QUAYUSER',
553-
passwordVariable: 'QUAYPASS'
554545
]
555546
]) {
556547
retry(5) {
557548
sh '''#! /bin/bash
558549
set -e
559-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
560550
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
561551
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
562552
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
563-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
553+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
564554
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
565555
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
566556
docker push ${PUSHIMAGE}:latest
@@ -569,7 +559,7 @@ pipeline {
569559
'''
570560
}
571561
sh '''#! /bin/bash
572-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
562+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
573563
docker rmi \
574564
${DELETEIMAGE}:${META_TAG} \
575565
${DELETEIMAGE}:latest || :
@@ -591,18 +581,11 @@ pipeline {
591581
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
592582
usernameVariable: 'DOCKERUSER',
593583
passwordVariable: 'DOCKERPASS'
594-
],
595-
[
596-
$class: 'UsernamePasswordMultiBinding',
597-
credentialsId: 'Quay.io-Robot',
598-
usernameVariable: 'QUAYUSER',
599-
passwordVariable: 'QUAYPASS'
600584
]
601585
]) {
602586
retry(5) {
603587
sh '''#! /bin/bash
604588
set -e
605-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
606589
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
607590
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
608591
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -636,26 +619,24 @@ pipeline {
636619
docker manifest push --purge ${MANIFESTIMAGE}:latest
637620
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
638621
done
639-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
640-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
641-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
642-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
643-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
644-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
645-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
646-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
647-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
648-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
649-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
650-
docker push ${LEGACYIMAGE}:latest
651-
docker push ${LEGACYIMAGE}:${META_TAG}
652-
docker push ${LEGACYIMAGE}:arm32v7-latest
653-
docker push ${LEGACYIMAGE}:arm64v8-latest
654-
done
622+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
623+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
624+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
625+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
626+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
627+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
628+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
629+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
630+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
631+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
632+
docker push ${GITHUBIMAGE}:latest
633+
docker push ${GITHUBIMAGE}:${META_TAG}
634+
docker push ${GITHUBIMAGE}:arm32v7-latest
635+
docker push ${GITHUBIMAGE}:arm64v8-latest
655636
'''
656637
}
657638
sh '''#! /bin/bash
658-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
639+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
659640
docker rmi \
660641
${DELETEIMAGE}:amd64-${META_TAG} \
661642
${DELETEIMAGE}:amd64-latest \

‎README.md

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
22

3-
[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
4-
[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
5-
[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
6-
[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
7-
[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
8-
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
3+
[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
4+
[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
5+
[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
6+
[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
7+
[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
8+
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
99

1010
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
1111

@@ -25,16 +25,15 @@ Find us at:
2525

2626
# [linuxserver/bookstack](https://github.com/linuxserver/docker-bookstack)
2727

28-
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bookstack.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bookstack)
29-
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bookstack/releases)
30-
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bookstack/packages)
31-
[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-bookstack/container_registry)
32-
[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/bookstack)
33-
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bookstack.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com")
34-
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bookstack)
35-
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bookstack)
36-
[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/)
37-
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html)
28+
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack)
29+
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack/releases)
30+
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bookstack/packages)
31+
[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-bookstack/container_registry)
32+
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com")
33+
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack)
34+
[![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)
35+
[![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/)
36+
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fbookstack%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html)
3837

3938
[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease.
4039

@@ -143,7 +142,7 @@ Container images are configured using parameters passed at runtime (such as thos
143142

144143
## Environment variables from files (Docker secrets)
145144

146-
You can set any environment variable from a file by using a special prepend `FILE__`.
145+
You can set any environment variable from a file by using a special prepend `FILE__`.
147146

148147
As an example:
149148

@@ -153,6 +152,11 @@ As an example:
153152

154153
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
155154

155+
## Umask for running applications
156+
157+
For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
158+
Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
159+
156160
## User / Group Identifiers
157161

158162
When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
@@ -192,7 +196,7 @@ The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/
192196

193197

194198
## Docker Mods
195-
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.")
199+
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.")
196200

197201
We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
198202

0 commit comments

Comments
 (0)