Skip to content

Commit d60b17b

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent ed71808 commit d60b17b

File tree

2 files changed

+38
-17
lines changed

2 files changed

+38
-17
lines changed

‎Jenkinsfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ pipeline {
6262
echo none
6363
fi''',
6464
returnStdout: true).trim()
65+
env.FUNDING_TAG = sh(
66+
script: '''#!/bin/bash
67+
if [ -e ./.github/FUNDING.yml ] ; then
68+
cat ./.github/FUNDING.yml | md5sum | cut -c1-8
69+
else
70+
echo none
71+
fi''',
72+
returnStdout: true).trim()
6573
}
6674
script{
6775
env.LS_RELEASE_NUMBER = sh(
@@ -236,15 +244,18 @@ pipeline {
236244
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
237245
if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
238246
[ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
239-
[ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then
247+
[ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \
248+
[ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then
240249
mkdir -p ${TEMPDIR}/repo
241250
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
242251
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
243252
cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
244253
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
245254
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
255+
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
256+
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml
246257
cd ${TEMPDIR}/repo/${LS_REPO}/
247-
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE
258+
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml
248259
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
249260
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
250261
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}

‎README.md

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
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+
[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
8+
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
9+
310
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
411

512
* regular and timely application updates
@@ -9,17 +16,20 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
916
* regular security updates
1017

1118
Find us at:
12-
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
13-
* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
1419
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
20+
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
21+
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
22+
* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
23+
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
24+
* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
1525

1626
# [linuxserver/bookstack](https://github.com/linuxserver/docker-bookstack)
17-
[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
18-
[![](https://images.microbadger.com/badges/version/linuxserver/bookstack.svg)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com")
19-
[![](https://images.microbadger.com/badges/image/linuxserver/bookstack.svg)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com")
20-
![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg)
21-
![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg)
22-
[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-bookstack/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/)
27+
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-bookstack/releases)
28+
[![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")
29+
[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/bookstack.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com")
30+
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bookstack)
31+
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/bookstack)
32+
[![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/)
2333
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html)
2434

2535
[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.
@@ -33,7 +43,7 @@ For more information on BookStack visit their website and check it out: https://
3343

3444
## Supported Architectures
3545

36-
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
46+
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
3747

3848
Simply pulling `linuxserver/bookstack` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
3949

@@ -170,17 +180,17 @@ The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/
170180

171181
* Shell access whilst the container is running: `docker exec -it bookstack /bin/bash`
172182
* To monitor the logs of the container in realtime: `docker logs -f bookstack`
173-
* container version number
183+
* container version number
174184
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' bookstack`
175185
* image version number
176186
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/bookstack`
177187

178188
## Updating Info
179189

180-
Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
181-
182-
Below are the instructions for updating containers:
183-
190+
Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
191+
192+
Below are the instructions for updating containers:
193+
184194
### Via Docker Run/Create
185195
* Update the image: `docker pull linuxserver/bookstack`
186196
* Stop the running container: `docker stop bookstack`
@@ -211,7 +221,7 @@ Below are the instructions for updating containers:
211221

212222
## Building locally
213223

214-
If you want to make local modifications to these images for development purposes or just to customize the logic:
224+
If you want to make local modifications to these images for development purposes or just to customize the logic:
215225
```
216226
git clone https://github.com/linuxserver/docker-bookstack.git
217227
cd docker-bookstack

0 commit comments

Comments
 (0)