Skip to content

Commit 10377d5

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent 9381996 commit 10377d5

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
@@ -128,7 +128,6 @@ pipeline {
128128
steps {
129129
script{
130130
env.IMAGE = env.DOCKERHUB_IMAGE
131-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
132131
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
133132
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
134133
if (env.MULTIARCH == 'true') {
@@ -149,7 +148,6 @@ pipeline {
149148
steps {
150149
script{
151150
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
152-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
153151
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
154152
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
155153
if (env.MULTIARCH == 'true') {
@@ -170,7 +168,6 @@ pipeline {
170168
steps {
171169
script{
172170
env.IMAGE = env.PR_DOCKERHUB_IMAGE
173-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
174171
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
175172
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
176173
if (env.MULTIARCH == 'true') {
@@ -535,22 +532,15 @@ pipeline {
535532
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
536533
usernameVariable: 'DOCKERUSER',
537534
passwordVariable: 'DOCKERPASS'
538-
],
539-
[
540-
$class: 'UsernamePasswordMultiBinding',
541-
credentialsId: 'Quay.io-Robot',
542-
usernameVariable: 'QUAYUSER',
543-
passwordVariable: 'QUAYPASS'
544535
]
545536
]) {
546537
retry(5) {
547538
sh '''#! /bin/bash
548539
set -e
549-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
550540
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
551541
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
552542
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
553-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
543+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
554544
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
555545
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
556546
docker push ${PUSHIMAGE}:latest
@@ -559,7 +549,7 @@ pipeline {
559549
'''
560550
}
561551
sh '''#! /bin/bash
562-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
552+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
563553
docker rmi \
564554
${DELETEIMAGE}:${META_TAG} \
565555
${DELETEIMAGE}:latest || :
@@ -581,18 +571,11 @@ pipeline {
581571
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
582572
usernameVariable: 'DOCKERUSER',
583573
passwordVariable: 'DOCKERPASS'
584-
],
585-
[
586-
$class: 'UsernamePasswordMultiBinding',
587-
credentialsId: 'Quay.io-Robot',
588-
usernameVariable: 'QUAYUSER',
589-
passwordVariable: 'QUAYPASS'
590574
]
591575
]) {
592576
retry(5) {
593577
sh '''#! /bin/bash
594578
set -e
595-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
596579
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
597580
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
598581
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -626,26 +609,24 @@ pipeline {
626609
docker manifest push --purge ${MANIFESTIMAGE}:latest
627610
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
628611
done
629-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
630-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
631-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
632-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
633-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
634-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
635-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
636-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
637-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
638-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
639-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
640-
docker push ${LEGACYIMAGE}:latest
641-
docker push ${LEGACYIMAGE}:${META_TAG}
642-
docker push ${LEGACYIMAGE}:arm32v7-latest
643-
docker push ${LEGACYIMAGE}:arm64v8-latest
644-
done
612+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
613+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
614+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
615+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
616+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
617+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
618+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
619+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
620+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
621+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
622+
docker push ${GITHUBIMAGE}:latest
623+
docker push ${GITHUBIMAGE}:${META_TAG}
624+
docker push ${GITHUBIMAGE}:arm32v7-latest
625+
docker push ${GITHUBIMAGE}:arm64v8-latest
645626
'''
646627
}
647628
sh '''#! /bin/bash
648-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
629+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
649630
docker rmi \
650631
${DELETEIMAGE}:amd64-${META_TAG} \
651632
${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/mysql-workbench](https://github.com/linuxserver/docker-mysql-workbench)
2727

28-
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-mysql-workbench.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-mysql-workbench)
29-
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-mysql-workbench.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-mysql-workbench/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-mysql-workbench/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-mysql-workbench/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/mysql-workbench)
33-
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/mysql-workbench.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/mysql-workbench "Get your own version badge on microbadger.com")
34-
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/mysql-workbench.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/mysql-workbench)
35-
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/mysql-workbench.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/mysql-workbench)
36-
[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-mysql-workbench/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mysql-workbench/job/master/)
37-
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/mysql-workbench/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/mysql-workbench/latest/index.html)
28+
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-mysql-workbench.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-mysql-workbench)
29+
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-mysql-workbench.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-mysql-workbench/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-mysql-workbench/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-mysql-workbench/container_registry)
32+
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/mysql-workbench.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/mysql-workbench "Get your own version badge on microbadger.com")
33+
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/mysql-workbench.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/mysql-workbench)
34+
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/mysql-workbench.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/mysql-workbench)
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-mysql-workbench%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mysql-workbench/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%2Fmysql-workbench%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/mysql-workbench/latest/index.html)
3837

3938
[MySQL Workbench](https://www.mysql.com/products/workbench/) is a unified visual tool for database architects, developers, and DBAs. MySQL Workbench provides data modeling, SQL development, and comprehensive administration tools for server configuration, user administration, backup, and much more.
4039

@@ -108,7 +107,7 @@ Container images are configured using parameters passed at runtime (such as thos
108107

109108
## Environment variables from files (Docker secrets)
110109

111-
You can set any environment variable from a file by using a special prepend `FILE__`.
110+
You can set any environment variable from a file by using a special prepend `FILE__`.
112111

113112
As an example:
114113

@@ -118,6 +117,11 @@ As an example:
118117

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

120+
## Umask for running applications
121+
122+
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.
123+
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.
124+
121125
## User / Group Identifiers
122126

123127
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`.
@@ -145,7 +149,7 @@ By default the user/pass is abc/abc, if you change your password or want to logi
145149

146150

147151
## Docker Mods
148-
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27mysql-workbench%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=mysql-workbench "view available mods for this container.")
152+
[![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%27mysql-workbench%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=mysql-workbench "view available mods for this container.")
149153

150154
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.
151155

0 commit comments

Comments
 (0)