Skip to content

Commit 9c804fc

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent 5ddc78f commit 9c804fc

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

2535
[Ldap-auth](https://github.com/nginxinc/nginx-ldap-auth) software is for authenticating users who request protected resources from servers proxied by nginx. It includes a daemon (ldap-auth) that communicates with an authentication server, and a webserver daemon that generates an authentication cookie based on the user’s credentials. The daemons are written in Python for use with a Lightweight Directory Access Protocol (LDAP) authentication server (OpenLDAP or Microsoft Windows Active Directory 2003 and 2012).
@@ -28,7 +38,7 @@ Find us at:
2838

2939
## Supported Architectures
3040

31-
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/).
41+
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/).
3242

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

@@ -100,17 +110,17 @@ Container images are configured using parameters passed at runtime (such as thos
100110

101111
* Shell access whilst the container is running: `docker exec -it ldap-auth /bin/bash`
102112
* To monitor the logs of the container in realtime: `docker logs -f ldap-auth`
103-
* container version number
113+
* container version number
104114
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' ldap-auth`
105115
* image version number
106116
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/ldap-auth`
107117

108118
## Updating Info
109119

110-
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.
111-
112-
Below are the instructions for updating containers:
113-
120+
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.
121+
122+
Below are the instructions for updating containers:
123+
114124
### Via Docker Run/Create
115125
* Update the image: `docker pull linuxserver/ldap-auth`
116126
* Stop the running container: `docker stop ldap-auth`
@@ -141,7 +151,7 @@ Below are the instructions for updating containers:
141151

142152
## Building locally
143153

144-
If you want to make local modifications to these images for development purposes or just to customize the logic:
154+
If you want to make local modifications to these images for development purposes or just to customize the logic:
145155
```
146156
git clone https://github.com/linuxserver/docker-ldap-auth.git
147157
cd docker-ldap-auth

0 commit comments

Comments
 (0)