Skip to content

Commit b51819a

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent c8bc9ab commit b51819a

File tree

2 files changed

+39
-54
lines changed

2 files changed

+39
-54
lines changed

‎Jenkinsfile‎

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ pipeline {
126126
steps {
127127
script{
128128
env.IMAGE = env.DOCKERHUB_IMAGE
129-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
130129
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
131130
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
132131
if (env.MULTIARCH == 'true') {
@@ -147,7 +146,6 @@ pipeline {
147146
steps {
148147
script{
149148
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
150-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
151149
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
152150
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
153151
if (env.MULTIARCH == 'true') {
@@ -168,7 +166,6 @@ pipeline {
168166
steps {
169167
script{
170168
env.IMAGE = env.PR_DOCKERHUB_IMAGE
171-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
172169
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
173170
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
174171
if (env.MULTIARCH == 'true') {
@@ -533,22 +530,15 @@ pipeline {
533530
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
534531
usernameVariable: 'DOCKERUSER',
535532
passwordVariable: 'DOCKERPASS'
536-
],
537-
[
538-
$class: 'UsernamePasswordMultiBinding',
539-
credentialsId: 'Quay.io-Robot',
540-
usernameVariable: 'QUAYUSER',
541-
passwordVariable: 'QUAYPASS'
542533
]
543534
]) {
544535
retry(5) {
545536
sh '''#! /bin/bash
546537
set -e
547-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
548538
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
549539
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
550540
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
551-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
541+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
552542
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
553543
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
554544
docker push ${PUSHIMAGE}:latest
@@ -557,7 +547,7 @@ pipeline {
557547
'''
558548
}
559549
sh '''#! /bin/bash
560-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
550+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
561551
docker rmi \
562552
${DELETEIMAGE}:${META_TAG} \
563553
${DELETEIMAGE}:latest || :
@@ -579,18 +569,11 @@ pipeline {
579569
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
580570
usernameVariable: 'DOCKERUSER',
581571
passwordVariable: 'DOCKERPASS'
582-
],
583-
[
584-
$class: 'UsernamePasswordMultiBinding',
585-
credentialsId: 'Quay.io-Robot',
586-
usernameVariable: 'QUAYUSER',
587-
passwordVariable: 'QUAYPASS'
588572
]
589573
]) {
590574
retry(5) {
591575
sh '''#! /bin/bash
592576
set -e
593-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
594577
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
595578
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
596579
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -624,26 +607,24 @@ pipeline {
624607
docker manifest push --purge ${MANIFESTIMAGE}:latest
625608
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
626609
done
627-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
628-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
629-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
630-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
631-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
632-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
633-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
634-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
635-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
636-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
637-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
638-
docker push ${LEGACYIMAGE}:latest
639-
docker push ${LEGACYIMAGE}:${META_TAG}
640-
docker push ${LEGACYIMAGE}:arm32v7-latest
641-
docker push ${LEGACYIMAGE}:arm64v8-latest
642-
done
610+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
611+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
612+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
613+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
614+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
615+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
616+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
617+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
618+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
619+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
620+
docker push ${GITHUBIMAGE}:latest
621+
docker push ${GITHUBIMAGE}:${META_TAG}
622+
docker push ${GITHUBIMAGE}:arm32v7-latest
623+
docker push ${GITHUBIMAGE}:arm64v8-latest
643624
'''
644625
}
645626
sh '''#! /bin/bash
646-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
627+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
647628
docker rmi \
648629
${DELETEIMAGE}:amd64-${META_TAG} \
649630
${DELETEIMAGE}:amd64-latest \

‎README.md‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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-
[![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-
[![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")
3+
[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](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?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
6+
[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
7+
[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
8+
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
99

1010
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
1111

@@ -25,16 +25,15 @@ Find us at:
2525

2626
# [linuxserver/smokeping](https://github.com/linuxserver/docker-smokeping)
2727

28-
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-smokeping.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-smokeping)
29-
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-smokeping.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-smokeping/releases)
30-
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-smokeping/packages)
31-
[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-smokeping/container_registry)
32-
[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/smokeping)
33-
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/smokeping.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/smokeping "Get your own version badge on microbadger.com")
34-
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/smokeping.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/smokeping)
35-
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/smokeping.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/smokeping)
36-
[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-smokeping/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-smokeping/job/master/)
37-
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/smokeping/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/smokeping/latest/index.html)
28+
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-smokeping.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-smokeping)
29+
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-smokeping.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-smokeping/releases)
30+
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-smokeping/packages)
31+
[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-smokeping/container_registry)
32+
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/smokeping.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/smokeping "Get your own version badge on microbadger.com")
33+
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/smokeping.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/smokeping)
34+
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/smokeping.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/smokeping)
35+
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-smokeping%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-smokeping/job/master/)
36+
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fsmokeping%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/smokeping/latest/index.html)
3837

3938
[Smokeping](https://oss.oetiker.ch/smokeping/) keeps track of your network latency. For a full example of what this application is capable of visit [UCDavis](http://smokeping.ucdavis.edu/cgi-bin/smokeping.fcgi).
4039

@@ -113,7 +112,7 @@ Container images are configured using parameters passed at runtime (such as thos
113112

114113
## Environment variables from files (Docker secrets)
115114

116-
You can set any environment variable from a file by using a special prepend `FILE__`.
115+
You can set any environment variable from a file by using a special prepend `FILE__`.
117116

118117
As an example:
119118

@@ -123,6 +122,11 @@ As an example:
123122

124123
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
125124

125+
## Umask for running applications
126+
127+
For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
128+
Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
129+
126130
## User / Group Identifiers
127131

128132
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`.
@@ -146,7 +150,7 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel
146150

147151

148152
## Docker Mods
149-
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27smokeping%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=smokeping "view available mods for this container.")
153+
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27smokeping%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=smokeping "view available mods for this container.")
150154

151155
We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
152156

0 commit comments

Comments
 (0)