Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit 3af7c25

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent 44775d9 commit 3af7c25

File tree

3 files changed

+40
-58
lines changed

3 files changed

+40
-58
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 docker-compose" -->

‎Jenkinsfile‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pipeline {
5858
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
5959
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
6060
env.PULL_REQUEST = env.CHANGE_ID
61-
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'
61+
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'
6262
}
6363
script{
6464
env.LS_RELEASE_NUMBER = sh(
@@ -145,6 +145,7 @@ pipeline {
145145
} else {
146146
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
147147
}
148+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
148149
env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
149150
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
150151
}
@@ -166,6 +167,7 @@ pipeline {
166167
} else {
167168
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
168169
}
170+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
169171
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
170172
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
171173
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
@@ -187,6 +189,7 @@ pipeline {
187189
} else {
188190
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
189191
}
192+
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
190193
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
191194
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
192195
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
@@ -248,9 +251,12 @@ pipeline {
248251
git checkout -f master
249252
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
250253
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
251-
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
254+
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
255+
rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md
256+
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
252257
cd ${TEMPDIR}/repo/${LS_REPO}/
253258
git add ${TEMPLATED_FILES}
259+
git rm .github/ISSUE_TEMPLATE.md || :
254260
git commit -m 'Bot Updating Templated Files'
255261
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
256262
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -320,8 +326,9 @@ pipeline {
320326
environment name: 'EXIT_STATUS', value: ''
321327
}
322328
steps {
329+
echo "Running on node: ${NODE_NAME}"
323330
sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
324-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
331+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
325332
}
326333
}
327334
// Build MultiArch Docker containers for push to LS Repo
@@ -333,21 +340,23 @@ pipeline {
333340
parallel {
334341
stage('Build X86') {
335342
steps {
343+
echo "Running on node: ${NODE_NAME}"
336344
sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
337-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
345+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
338346
}
339347
}
340348
stage('Build ARMHF') {
341349
agent {
342350
label 'ARMHF'
343351
}
344352
steps {
353+
echo "Running on node: ${NODE_NAME}"
345354
echo 'Logging into Github'
346355
sh '''#! /bin/bash
347356
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
348357
'''
349358
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
350-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
359+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
351360
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
352361
retry(5) {
353362
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -362,12 +371,13 @@ pipeline {
362371
label 'ARM64'
363372
}
364373
steps {
374+
echo "Running on node: ${NODE_NAME}"
365375
echo 'Logging into Github'
366376
sh '''#! /bin/bash
367377
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
368378
'''
369379
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
370-
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
380+
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
371381
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
372382
retry(5) {
373383
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -440,6 +450,13 @@ pipeline {
440450
environment name: 'EXIT_STATUS', value: ''
441451
}
442452
steps {
453+
sh '''#! /bin/bash
454+
echo "Packages were updated. Cleaning up the image and exiting."
455+
if [ "${MULTIARCH}" == "true" ]; then
456+
docker rmi ${IMAGE}:amd64-${META_TAG}
457+
else
458+
docker rmi ${IMAGE}:${META_TAG}
459+
fi'''
443460
script{
444461
env.EXIT_STATUS = 'ABORTED'
445462
}
@@ -457,6 +474,13 @@ pipeline {
457474
}
458475
}
459476
steps {
477+
sh '''#! /bin/bash
478+
echo "There are no package updates. Cleaning up the image and exiting."
479+
if [ "${MULTIARCH}" == "true" ]; then
480+
docker rmi ${IMAGE}:amd64-${META_TAG}
481+
else
482+
docker rmi ${IMAGE}:${META_TAG}
483+
fi'''
460484
script{
461485
env.EXIT_STATUS = 'ABORTED'
462486
}
@@ -546,7 +570,7 @@ pipeline {
546570
'''
547571
}
548572
sh '''#! /bin/bash
549-
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
573+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
550574
docker rmi \
551575
${DELETEIMAGE}:${META_TAG} \
552576
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
@@ -610,6 +634,7 @@ pipeline {
610634
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
611635
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
612636
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
637+
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
613638
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
614639
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
615640
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
@@ -624,10 +649,13 @@ pipeline {
624649
docker rmi \
625650
${DELETEIMAGE}:amd64-${META_TAG} \
626651
${DELETEIMAGE}:amd64-latest \
652+
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
627653
${DELETEIMAGE}:arm32v7-${META_TAG} \
628654
${DELETEIMAGE}:arm32v7-latest \
655+
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
629656
${DELETEIMAGE}:arm64v8-${META_TAG} \
630-
${DELETEIMAGE}:arm64v8-latest || :
657+
${DELETEIMAGE}:arm64v8-latest \
658+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
631659
done
632660
docker rmi \
633661
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
@@ -694,7 +722,7 @@ pipeline {
694722
-e DOCKER_REPOSITORY=${IMAGE} \
695723
-e GIT_BRANCH=master \
696724
-v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
697-
ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync'
725+
ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync'
698726
rm -Rf ${TEMPDIR} '''
699727
}
700728
}

‎README.md‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,14 @@ You can replace the last line with any docker-compose command and argument, whic
7878

7979
### Recommended method
8080

81-
We provide a very convenient script that allows the docker-compose container to run as if it was installed natively.
82-
83-
First run the following commands to setup the script:
81+
We provide a very convenient script that allows the docker-compose container to run as if it was installed natively:
8482

8583
```
86-
export DOCKER_COMPOSE_IMAGE_TAG=ghcr.io/linuxserver/docker-compose:latest
8784
sudo curl -L --fail https://raw.githubusercontent.com/linuxserver/docker-docker-compose/master/run.sh -o /usr/local/bin/docker-compose
8885
sudo chmod +x /usr/local/bin/docker-compose
8986
```
9087

91-
After running these commands you can issue commands such as `docker-compose up -d` and the docker-compose container will do its job behind the scenes.
92-
93-
The `DOCKER_COMPOSE_IMAGE_TAG` variable needs to be made persistent in order to continue using our image after logging out or rebooting. To do this you will need to edit `/etc/environment` and add or set the following variable:
94-
95-
```
96-
DOCKER_COMPOSE_IMAGE_TAG=ghcr.io/linuxserver/docker-compose:latest
97-
```
88+
Running these two commands on your docker host once will let you issue commands such as `docker-compose up -d` and the docker-compose container will do its job behind the scenes.
9889

9990
### Binaries
10091

@@ -139,7 +130,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
139130

140131
## Versions
141132

142-
* **03.11.20:** - Update run.sh with formatting changes. IMPORTANT!! This now requires a `DOCKER_COMPOSE_IMAGE_TAG` variable to be set in order to use our image! See https://github.com/linuxserver/docker-docker-compose#recommended-method for instructions!
133+
* **17.12.20:** - Update run.sh with formatting changes.
143134
* **04.10.20:** - Update run.sh with changes from upstream.
144135
* **31.08.20:** - Update tox and virtualenv.
145136
* **31.07.20:** - Add support for global env var `DOCKER_COMPOSE_IMAGE_TAG` in the `run.sh` script.

0 commit comments

Comments
 (0)