Skip to content

Commit 798424b

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent b109c7c commit 798424b

File tree

3 files changed

+38
-47
lines changed

3 files changed

+38
-47
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1 @@
1-
[linuxserverurl]: https://linuxserver.io
2-
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
31

4-
<!--- 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. --->
5-
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 -->
10-
11-
------------------------------
12-
13-
## Expected Behavior
14-
<!--- Tell us what should happen -->
15-
16-
## Current Behavior
17-
<!--- Tell us what happens instead of the expected behavior -->
18-
19-
## Steps to Reproduce
20-
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
21-
<!--- reproduce this bug. Include code to reproduce, if relevant -->
22-
1.
23-
2.
24-
3.
25-
4.
26-
27-
## Environment
28-
**OS:**
29-
**CPU architecture:** x86_64/arm32/arm64
30-
**How docker service was installed:**
31-
<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
32-
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
33-
34-
## Command used to create docker container (run/create/compose/screenshot)
35-
<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
36-
37-
## Docker logs
38-
<!--- Provide a full docker log, output of "docker logs nginx" -->

‎Jenkinsfile‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pipeline {
5555
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
5656
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
5757
env.PULL_REQUEST = env.CHANGE_ID
58-
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'
58+
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 ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml'
5959
}
6060
script{
6161
env.LS_RELEASE_NUMBER = sh(
@@ -133,6 +133,7 @@ pipeline {
133133
} else {
134134
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
135135
}
136+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
136137
env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
137138
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
138139
}
@@ -154,6 +155,7 @@ pipeline {
154155
} else {
155156
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
156157
}
158+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
157159
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
158160
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
159161
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
@@ -175,6 +177,7 @@ pipeline {
175177
} else {
176178
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
177179
}
180+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
178181
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
179182
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
180183
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
@@ -236,9 +239,12 @@ pipeline {
236239
git checkout -f master
237240
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
238241
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
239-
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
242+
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
243+
rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md
244+
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
240245
cd ${TEMPDIR}/repo/${LS_REPO}/
241246
git add ${TEMPLATED_FILES}
247+
git rm .github/ISSUE_TEMPLATE.md || :
242248
git commit -m 'Bot Updating Templated Files'
243249
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
244250
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -308,8 +314,9 @@ pipeline {
308314
environment name: 'EXIT_STATUS', value: ''
309315
}
310316
steps {
317+
echo "Running on node: ${NODE_NAME}"
311318
sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
312-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
319+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
313320
}
314321
}
315322
// Build MultiArch Docker containers for push to LS Repo
@@ -321,21 +328,23 @@ pipeline {
321328
parallel {
322329
stage('Build X86') {
323330
steps {
331+
echo "Running on node: ${NODE_NAME}"
324332
sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
325-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
333+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
326334
}
327335
}
328336
stage('Build ARMHF') {
329337
agent {
330338
label 'ARMHF'
331339
}
332340
steps {
341+
echo "Running on node: ${NODE_NAME}"
333342
echo 'Logging into Github'
334343
sh '''#! /bin/bash
335344
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
336345
'''
337346
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
338-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
347+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
339348
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
340349
retry(5) {
341350
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -350,12 +359,13 @@ pipeline {
350359
label 'ARM64'
351360
}
352361
steps {
362+
echo "Running on node: ${NODE_NAME}"
353363
echo 'Logging into Github'
354364
sh '''#! /bin/bash
355365
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
356366
'''
357367
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
358-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
368+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
359369
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
360370
retry(5) {
361371
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -428,6 +438,13 @@ pipeline {
428438
environment name: 'EXIT_STATUS', value: ''
429439
}
430440
steps {
441+
sh '''#! /bin/bash
442+
echo "Packages were updated. Cleaning up the image and exiting."
443+
if [ "${MULTIARCH}" == "true" ]; then
444+
docker rmi ${IMAGE}:amd64-${META_TAG}
445+
else
446+
docker rmi ${IMAGE}:${META_TAG}
447+
fi'''
431448
script{
432449
env.EXIT_STATUS = 'ABORTED'
433450
}
@@ -445,6 +462,13 @@ pipeline {
445462
}
446463
}
447464
steps {
465+
sh '''#! /bin/bash
466+
echo "There are no package updates. Cleaning up the image and exiting."
467+
if [ "${MULTIARCH}" == "true" ]; then
468+
docker rmi ${IMAGE}:amd64-${META_TAG}
469+
else
470+
docker rmi ${IMAGE}:${META_TAG}
471+
fi'''
448472
script{
449473
env.EXIT_STATUS = 'ABORTED'
450474
}
@@ -534,7 +558,7 @@ pipeline {
534558
'''
535559
}
536560
sh '''#! /bin/bash
537-
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
561+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
538562
docker rmi \
539563
${DELETEIMAGE}:${META_TAG} \
540564
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
@@ -598,6 +622,7 @@ pipeline {
598622
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
599623
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
600624
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
625+
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
601626
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
602627
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
603628
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
@@ -612,10 +637,13 @@ pipeline {
612637
docker rmi \
613638
${DELETEIMAGE}:amd64-${META_TAG} \
614639
${DELETEIMAGE}:amd64-latest \
640+
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
615641
${DELETEIMAGE}:arm32v7-${META_TAG} \
616642
${DELETEIMAGE}:arm32v7-latest \
643+
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
617644
${DELETEIMAGE}:arm64v8-${META_TAG} \
618-
${DELETEIMAGE}:arm64v8-latest || :
645+
${DELETEIMAGE}:arm64v8-latest \
646+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
619647
done
620648
docker rmi \
621649
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
@@ -682,7 +710,7 @@ pipeline {
682710
-e DOCKER_REPOSITORY=${IMAGE} \
683711
-e GIT_BRANCH=master \
684712
-v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
685-
ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync'
713+
ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync'
686714
rm -Rf ${TEMPDIR} '''
687715
}
688716
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
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-nginx.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nginx)
3232
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nginx.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nginx/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-nginx/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-nginx/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-nginx/container_registry)
3535
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/nginx.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/nginx "Get your own version badge on microbadger.com")
3636
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nginx.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/nginx)
3737
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nginx.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/nginx)

0 commit comments

Comments
 (0)