Skip to content

Commit 1a0e3c7

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent ac6419d commit 1a0e3c7

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
@@ -57,6 +57,14 @@ pipeline {
5757
echo none
5858
fi''',
5959
returnStdout: true).trim()
60+
env.FUNDING_TAG = sh(
61+
script: '''#!/bin/bash
62+
if [ -e ./.github/FUNDING.yml ] ; then
63+
cat ./.github/FUNDING.yml | md5sum | cut -c1-8
64+
else
65+
echo none
66+
fi''',
67+
returnStdout: true).trim()
6068
}
6169
script{
6270
env.LS_RELEASE_NUMBER = sh(
@@ -224,15 +232,18 @@ pipeline {
224232
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
225233
if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
226234
[ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
227-
[ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then
235+
[ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \
236+
[ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then
228237
mkdir -p ${TEMPDIR}/repo
229238
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
230239
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
231240
cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
232241
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
233242
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
243+
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
244+
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml
234245
cd ${TEMPDIR}/repo/${LS_REPO}/
235-
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE
246+
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml
236247
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
237248
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
238249
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/dokuwiki](https://github.com/linuxserver/docker-dokuwiki)
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/dokuwiki.svg)](https://microbadger.com/images/linuxserver/dokuwiki "Get your own version badge on microbadger.com")
19-
[![](https://images.microbadger.com/badges/image/linuxserver/dokuwiki.svg)](https://microbadger.com/images/linuxserver/dokuwiki "Get your own version badge on microbadger.com")
20-
![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/dokuwiki.svg)
21-
![Docker Stars](https://img.shields.io/docker/stars/linuxserver/dokuwiki.svg)
22-
[![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Pipeline-Builders/docker-dokuwiki/master)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-dokuwiki/job/master/)
27+
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-dokuwiki.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-dokuwiki/releases)
28+
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/dokuwiki.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/dokuwiki "Get your own version badge on microbadger.com")
29+
[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/dokuwiki.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/dokuwiki "Get your own version badge on microbadger.com")
30+
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/dokuwiki.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/dokuwiki)
31+
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/dokuwiki.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/dokuwiki)
32+
[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-dokuwiki/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-dokuwiki/job/master/)
2333
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/dokuwiki/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/dokuwiki/latest/index.html)
2434

2535
[Dokuwiki](https://www.dokuwiki.org/dokuwiki/) is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in access controls and authentication connectors make DokuWiki especially useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.
@@ -29,7 +39,7 @@ Find us at:
2939

3040
## Supported Architectures
3141

32-
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/).
42+
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/).
3343

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

@@ -126,17 +136,17 @@ Upon first install go to `http://$IP:$PORT/install.php` once you have completed
126136

127137
* Shell access whilst the container is running: `docker exec -it dokuwiki /bin/bash`
128138
* To monitor the logs of the container in realtime: `docker logs -f dokuwiki`
129-
* container version number
139+
* container version number
130140
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' dokuwiki`
131141
* image version number
132142
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/dokuwiki`
133143

134144
## Updating Info
135145

136-
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.
137-
138-
Below are the instructions for updating containers:
139-
146+
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.
147+
148+
Below are the instructions for updating containers:
149+
140150
### Via Docker Run/Create
141151
* Update the image: `docker pull linuxserver/dokuwiki`
142152
* Stop the running container: `docker stop dokuwiki`
@@ -167,7 +177,7 @@ Below are the instructions for updating containers:
167177

168178
## Building locally
169179

170-
If you want to make local modifications to these images for development purposes or just to customize the logic:
180+
If you want to make local modifications to these images for development purposes or just to customize the logic:
171181
```
172182
git clone https://github.com/linuxserver/docker-dokuwiki.git
173183
cd docker-dokuwiki

0 commit comments

Comments
 (0)