Skip to content

Commit 710f74a

Browse files
Bot Updating Templated Files
1 parent 09546e0 commit 710f74a

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ pipeline {
618618
docker manifest push --purge ${MANIFESTIMAGE}:latest
619619
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
620620
done
621-
for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do
621+
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
622622
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
623623
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
624624
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
@@ -732,12 +732,12 @@ pipeline {
732732
sh 'echo "build aborted"'
733733
}
734734
else if (currentBuild.currentResult == "SUCCESS"){
735-
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
735+
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
736736
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
737737
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
738738
}
739739
else {
740-
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
740+
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
741741
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
742742
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
743743
}

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[![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.")
66
[![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.")
77
[![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-
[![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).")
98
[![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")
109

1110
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
@@ -22,7 +21,6 @@ Find us at:
2221
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
2322
* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
2423
* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
25-
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
2624
* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
2725

2826
# [linuxserver/ldap-auth](https://github.com/linuxserver/docker-ldap-auth)
@@ -103,6 +101,18 @@ Container images are configured using parameters passed at runtime (such as thos
103101
| `-p 9000` | the port for ldap login page |
104102
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
105103

104+
## Environment variables from files (Docker secrets)
105+
106+
You can set any environment variable from a file by using a special prepend `FILE__`.
107+
108+
As an example:
109+
110+
```
111+
-e FILE__PASSWORD=/run/secrets/mysecretpassword
112+
```
113+
114+
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
115+
106116

107117
 
108118
## Application Setup

0 commit comments

Comments
 (0)