Skip to content

Commit faf6950

Browse files
Bot Updating Templated Files
1 parent db8b30e commit faf6950

File tree

2 files changed

+53
-12
lines changed

2 files changed

+53
-12
lines changed

Jenkinsfile

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pipeline {
3838
script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''',
3939
returnStdout: true).trim()
4040
env.LS_RELEASE_NOTES = sh(
41-
script: '''git log -1 --pretty=%B | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
41+
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
4242
returnStdout: true).trim()
4343
env.GITHUB_DATE = sh(
4444
script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
@@ -282,6 +282,9 @@ pipeline {
282282
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
283283
sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
284284
sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
285+
sh '''docker rmi \
286+
${IMAGE}:arm32v6-${META_TAG} \
287+
lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} '''
285288
}
286289
}
287290
}
@@ -308,6 +311,9 @@ pipeline {
308311
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
309312
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
310313
sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
314+
sh '''docker rmi \
315+
${IMAGE}:arm64v8-${META_TAG} \
316+
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
311317
}
312318
}
313319
}
@@ -469,6 +475,10 @@ pipeline {
469475
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
470476
sh "docker push ${IMAGE}:latest"
471477
sh "docker push ${IMAGE}:${META_TAG}"
478+
sh '''docker rmi \
479+
${IMAGE}:${META_TAG} \
480+
${IMAGE}:latest '''
481+
472482
}
473483
}
474484
}
@@ -516,6 +526,15 @@ pipeline {
516526
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
517527
sh "docker manifest push --purge ${IMAGE}:latest"
518528
sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
529+
sh '''docker rmi \
530+
${IMAGE}:amd64-${META_TAG} \
531+
${IMAGE}:amd64-latest \
532+
${IMAGE}:arm32v6-${META_TAG} \
533+
${IMAGE}:arm32v6-latest \
534+
${IMAGE}:arm64v8-${META_TAG} \
535+
${IMAGE}:arm64v8-latest \
536+
lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} \
537+
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
519538
}
520539
}
521540
}
@@ -576,6 +595,18 @@ pipeline {
576595
}
577596
}
578597
}
598+
// If this is a Pull request send the CI link as a comment on it
599+
stage('Pull Request Comment') {
600+
when {
601+
not {environment name: 'CHANGE_ID', value: ''}
602+
environment name: 'CI', value: 'true'
603+
environment name: 'EXIT_STATUS', value: ''
604+
}
605+
steps {
606+
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
607+
-d '{"body": "I am a bot, here are the test results for this PR '${CI_URL}'"}' '''
608+
}
609+
}
579610
}
580611
/* ######################
581612
Send status to Discord

README.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ Here are some example snippets to help you get started creating a container.
5151
```
5252
docker create \
5353
--name=qbittorrent \
54-
-e PUID=1001 \
55-
-e PGID=1001 \
54+
-e PUID=1000 \
55+
-e PGID=1000 \
5656
-e TZ=Europe/London \
5757
-e UMASK_SET=022 \
5858
-e WEBUI_PORT=8080 \
@@ -77,8 +77,8 @@ services:
7777
image: linuxserver/qbittorrent
7878
container_name: qbittorrent
7979
environment:
80-
- PUID=1001
81-
- PGID=1001
80+
- PUID=1000
81+
- PGID=1000
8282
- TZ=Europe/London
8383
- UMASK_SET=022
8484
- WEBUI_PORT=8080
@@ -88,7 +88,6 @@ services:
8888
- 6881:6881
8989
- 6881:6881/udp
9090
- 8080:8080
91-
mem_limit: 4096m
9291
restart: unless-stopped
9392
```
9493

@@ -101,8 +100,8 @@ Container images are configured using parameters passed at runtime (such as thos
101100
| `-p 6881` | tcp connection port |
102101
| `-p 6881/udp` | udp connection port |
103102
| `-p 8080` | http gui |
104-
| `-e PUID=1001` | for UserID - see below for explanation |
105-
| `-e PGID=1001` | for GroupID - see below for explanation |
103+
| `-e PUID=1000` | for UserID - see below for explanation |
104+
| `-e PGID=1000` | for GroupID - see below for explanation |
106105
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
107106
| `-e UMASK_SET=022` | for umask setting of qbittorrent, optional , default if left unset is 022 |
108107
| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
@@ -114,11 +113,11 @@ When using volumes (`-v` flags) permissions issues can arise between the host OS
114113

115114
Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
116115

117-
In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below:
116+
In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
118117

119118
```
120119
$ id username
121-
uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
120+
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
122121
```
123122

124123

@@ -173,9 +172,20 @@ Below are the instructions for updating containers:
173172
* Start the new container: `docker start qbittorrent`
174173
* You can also remove the old dangling images: `docker image prune`
175174

175+
### Via Taisun auto-updater (especially useful if you don't remember the original parameters)
176+
* Pull the latest image at its tag and replace it with the same env variables in one shot:
177+
```
178+
docker run --rm \
179+
-v /var/run/docker.sock:/var/run/docker.sock taisun/updater \
180+
--oneshot qbittorrent
181+
```
182+
* You can also remove the old dangling images: `docker image prune`
183+
176184
### Via Docker Compose
177-
* Update the image: `docker-compose pull linuxserver/qbittorrent`
178-
* Let compose update containers as necessary: `docker-compose up -d`
185+
* Update all images: `docker-compose pull`
186+
* or update a single image: `docker-compose pull qbittorrent`
187+
* Let compose update all containers as necessary: `docker-compose up -d`
188+
* or update a single container: `docker-compose up -d qbittorrent`
179189
* You can also remove the old dangling images: `docker image prune`
180190

181191
## Versions

0 commit comments

Comments
 (0)