Skip to content

Commit 78e7a56

Browse files
Bot Updating Templated Files
1 parent c0c1369 commit 78e7a56

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

Jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ pipeline {
617617
docker manifest push --purge ${MANIFESTIMAGE}:latest
618618
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
619619
done
620-
for LEGACYIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}"; do
620+
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
621621
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
622622
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
623623
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
@@ -731,12 +731,12 @@ pipeline {
731731
sh 'echo "build aborted"'
732732
}
733733
else if (currentBuild.currentResult == "SUCCESS"){
734-
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
734+
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,\
735735
"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"}],\
736736
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
737737
}
738738
else {
739-
sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
739+
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,\
740740
"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"}],\
741741
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
742742
}

README.md

+12-2
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/mariadb](https://github.com/linuxserver/docker-mariadb)
@@ -125,6 +123,18 @@ Container images are configured using parameters passed at runtime (such as thos
125123
| `-e REMOTE_SQL=http://URL1/your.sql,https://URL2/your.sql` | Set this to ingest sql files from an http/https endpoint (comma seperated array). |
126124
| `-v /config` | Contains the db itself and all assorted settings. |
127125

126+
## Environment variables from files (Docker secrets)
127+
128+
You can set any environment variable from a file by using a special prepend `FILE__`.
129+
130+
As an example:
131+
132+
```
133+
-e FILE__PASSWORD=/run/secrets/mysecretpassword
134+
```
135+
136+
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
137+
128138
## User / Group Identifiers
129139

130140
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`.

0 commit comments

Comments
 (0)