Skip to content

Commit af548a0

Browse files
aptalcaaptalca
committed
Merge branch 'master' into zerossl
2 parents 87cdcfd + bb53d24 commit af548a0

File tree

14 files changed

+224
-66
lines changed

14 files changed

+224
-66
lines changed

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Discord chat support
4+
url: https://discord.gg/YWrKVTn
5+
about: Realtime support / chat with the community and the team.
6+
7+
- name: Discourse discussion forum
8+
url: https://discourse.linuxserver.io
9+
about: Post on our community forum.
10+
11+
- name: Documentation
12+
url: https://docs.linuxserver.io/images/docker-swag
13+
about: Documentation - information about all of our containers.

‎.github/ISSUE_TEMPLATE.md‎ renamed to ‎.github/ISSUE_TEMPLATE/issue.bug.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
16
[linuxserverurl]: https://linuxserver.io
27
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
38

49
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
510

6-
<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
7-
<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
8-
9-
<!--- Provide a general summary of the issue in the Title above -->
11+
<!--- Provide a general summary of the bug in the Title above -->
1012

1113
------------------------------
1214

‎.github/ISSUE_TEMPLATE/issue.feature.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
[linuxserverurl]: https://linuxserver.io
7+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
8+
9+
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
10+
11+
<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
12+
<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
13+
14+
<!--- Provide a general summary of the request in the Title above -->
15+
16+
------------------------------
17+
18+
## Desired Behavior
19+
<!--- Tell us what should happen -->
20+
21+
## Current Behavior
22+
<!--- Tell us what happens instead of the expected behavior -->
23+
24+
## Alternatives Considered
25+
<!--- Tell us what other options you have tried or considered -->

‎.github/workflows/external_trigger.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
2828
exit 1
2929
fi
30+
EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
3031
echo "**** External version: ${EXT_RELEASE} ****"
3132
echo "**** Retrieving last pushed version ****"
3233
image="linuxserver/swag"

‎.github/workflows/external_trigger_scheduler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/[email protected]
1313
with:
1414
fetch-depth: '0'
15-
15+
1616
- name: External Trigger Scheduler
1717
run: |
1818
echo "**** Branches found: ****"

‎.github/workflows/package_trigger_scheduler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/[email protected]
1313
with:
1414
fetch-depth: '0'
15-
15+
1616
- name: Package Trigger Scheduler
1717
run: |
1818
echo "**** Branches found: ****"

‎Jenkinsfile‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pipeline {
5656
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
5757
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
5858
env.PULL_REQUEST = env.CHANGE_ID
59-
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt'
59+
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./root/donate.txt ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml'
6060
}
6161
script{
6262
env.LS_RELEASE_NUMBER = sh(
@@ -135,6 +135,7 @@ pipeline {
135135
} else {
136136
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
137137
}
138+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
138139
env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
139140
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
140141
}
@@ -156,6 +157,7 @@ pipeline {
156157
} else {
157158
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
158159
}
160+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
159161
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
160162
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
161163
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
@@ -177,6 +179,7 @@ pipeline {
177179
} else {
178180
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
179181
}
182+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
180183
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
181184
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
182185
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
@@ -238,9 +241,12 @@ pipeline {
238241
git checkout -f master
239242
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
240243
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
241-
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
244+
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
245+
rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md
246+
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
242247
cd ${TEMPDIR}/repo/${LS_REPO}/
243248
git add ${TEMPLATED_FILES}
249+
git rm .github/ISSUE_TEMPLATE.md || :
244250
git commit -m 'Bot Updating Templated Files'
245251
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
246252
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -310,8 +316,9 @@ pipeline {
310316
environment name: 'EXIT_STATUS', value: ''
311317
}
312318
steps {
319+
echo "Running on node: ${NODE_NAME}"
313320
sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
314-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
321+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
315322
}
316323
}
317324
// Build MultiArch Docker containers for push to LS Repo
@@ -323,21 +330,23 @@ pipeline {
323330
parallel {
324331
stage('Build X86') {
325332
steps {
333+
echo "Running on node: ${NODE_NAME}"
326334
sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
327-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
335+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
328336
}
329337
}
330338
stage('Build ARMHF') {
331339
agent {
332340
label 'ARMHF'
333341
}
334342
steps {
343+
echo "Running on node: ${NODE_NAME}"
335344
echo 'Logging into Github'
336345
sh '''#! /bin/bash
337346
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
338347
'''
339348
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
340-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
349+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
341350
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
342351
retry(5) {
343352
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -352,12 +361,13 @@ pipeline {
352361
label 'ARM64'
353362
}
354363
steps {
364+
echo "Running on node: ${NODE_NAME}"
355365
echo 'Logging into Github'
356366
sh '''#! /bin/bash
357367
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
358368
'''
359369
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
360-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
370+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
361371
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
362372
retry(5) {
363373
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -430,6 +440,13 @@ pipeline {
430440
environment name: 'EXIT_STATUS', value: ''
431441
}
432442
steps {
443+
sh '''#! /bin/bash
444+
echo "Packages were updated. Cleaning up the image and exiting."
445+
if [ "${MULTIARCH}" == "true" ]; then
446+
docker rmi ${IMAGE}:amd64-${META_TAG}
447+
else
448+
docker rmi ${IMAGE}:${META_TAG}
449+
fi'''
433450
script{
434451
env.EXIT_STATUS = 'ABORTED'
435452
}
@@ -447,6 +464,13 @@ pipeline {
447464
}
448465
}
449466
steps {
467+
sh '''#! /bin/bash
468+
echo "There are no package updates. Cleaning up the image and exiting."
469+
if [ "${MULTIARCH}" == "true" ]; then
470+
docker rmi ${IMAGE}:amd64-${META_TAG}
471+
else
472+
docker rmi ${IMAGE}:${META_TAG}
473+
fi'''
450474
script{
451475
env.EXIT_STATUS = 'ABORTED'
452476
}
@@ -536,7 +560,7 @@ pipeline {
536560
'''
537561
}
538562
sh '''#! /bin/bash
539-
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
563+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
540564
docker rmi \
541565
${DELETEIMAGE}:${META_TAG} \
542566
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
@@ -600,6 +624,7 @@ pipeline {
600624
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
601625
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
602626
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
627+
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
603628
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
604629
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
605630
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
@@ -614,10 +639,13 @@ pipeline {
614639
docker rmi \
615640
${DELETEIMAGE}:amd64-${META_TAG} \
616641
${DELETEIMAGE}:amd64-latest \
642+
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
617643
${DELETEIMAGE}:arm32v7-${META_TAG} \
618644
${DELETEIMAGE}:arm32v7-latest \
645+
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
619646
${DELETEIMAGE}:arm64v8-${META_TAG} \
620-
${DELETEIMAGE}:arm64v8-latest || :
647+
${DELETEIMAGE}:arm64v8-latest \
648+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
621649
done
622650
docker rmi \
623651
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
@@ -684,7 +712,7 @@ pipeline {
684712
-e DOCKER_REPOSITORY=${IMAGE} \
685713
-e GIT_BRANCH=master \
686714
-v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
687-
ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync'
715+
ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync'
688716
rm -Rf ${TEMPDIR} '''
689717
}
690718
}

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Find us at:
3131
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag)
3232
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag/releases)
3333
[![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-swag/packages)
34-
[![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-swag/container_registry)
34+
[![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-swag/container_registry)
3535
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/swag "Get your own version badge on microbadger.com")
3636
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
3737
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
@@ -326,7 +326,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
326326

327327
## Versions
328328

329-
* **10.12.20:** - Add support for getting certs from [ZeroSSL](https://zerossl.com/) via optional `CERTPROVIDER` env var.
329+
* **08.01.21:** - Add support for getting certs from [ZeroSSL](https://zerossl.com/) via optional `CERTPROVIDER` env var.
330+
* **03.01.21:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) /config/nginx/site-confs/default - Add helper pages to aid troubleshooting
330331
* **10.12.20:** - Add support for njalla dns validation
331332
* **09.12.20:** - Check for template/conf updates and notify in the log. Add support for gehirn and sakuracloud dns validation.
332333
* **01.11.20:** - Add support for netcup dns validation

0 commit comments

Comments
 (0)