Skip to content

Commit a384d12

Browse files
Bot Updating Templated Files
1 parent b2ce140 commit a384d12

File tree

2 files changed

+54
-19
lines changed

2 files changed

+54
-19
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: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ Find us at:
1414
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
1515
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
1616

17-
# PSA: Changes are happening
18-
19-
From August 2018 onwards, Linuxserver are in the midst of switching to a new CI platform which will enable us to build and release multiple architectures under a single repo. To this end, existing images for `arm64` and `armhf` builds are being deprecated. They are replaced by a manifest file in each container which automatically pulls the correct image for your architecture. You'll also be able to pull based on a specific architecture tag.
20-
21-
TLDR: Multi-arch support is changing from multiple repos to one repo per container image.
22-
2317
# [linuxserver/mariadb](https://github.com/linuxserver/docker-mariadb)
2418
[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn)
2519
[![](https://images.microbadger.com/badges/version/linuxserver/mariadb.svg)](https://microbadger.com/images/linuxserver/mariadb "Get your own version badge on microbadger.com")
@@ -35,7 +29,7 @@ TLDR: Multi-arch support is changing from multiple repos to one repo per contain
3529

3630
## Supported Architectures
3731

38-
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list).
32+
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
3933

4034
Simply pulling `linuxserver/mariadb` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
4135

@@ -57,8 +51,8 @@ Here are some example snippets to help you get started creating a container.
5751
```
5852
docker create \
5953
--name=mariadb \
60-
-e PUID=1001 \
61-
-e PGID=1001 \
54+
-e PUID=1000 \
55+
-e PGID=1000 \
6256
-e MYSQL_ROOT_PASSWORD=<DATABASE PASSWORD> \
6357
-e TZ=Europe/London \
6458
-p 3306:3306 \
@@ -80,15 +74,14 @@ services:
8074
image: linuxserver/mariadb
8175
container_name: mariadb
8276
environment:
83-
- PUID=1001
84-
- PGID=1001
77+
- PUID=1000
78+
- PGID=1000
8579
- MYSQL_ROOT_PASSWORD=<DATABASE PASSWORD>
8680
- TZ=Europe/London
8781
volumes:
8882
- <path to data>:/config
8983
ports:
9084
- 3306:3306
91-
mem_limit: 4096m
9285
restart: unless-stopped
9386
```
9487

@@ -99,8 +92,8 @@ Container images are configured using parameters passed at runtime (such as thos
9992
| Parameter | Function |
10093
| :----: | --- |
10194
| `-p 3306` | Mariadb listens on this port. |
102-
| `-e PUID=1001` | for UserID - see below for explanation |
103-
| `-e PGID=1001` | for GroupID - see below for explanation |
95+
| `-e PUID=1000` | for UserID - see below for explanation |
96+
| `-e PGID=1000` | for GroupID - see below for explanation |
10497
| `-e MYSQL_ROOT_PASSWORD=<DATABASE PASSWORD>` | Set this to root password for installation (minimum 4 characters). |
10598
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
10699
| `-v /config` | Contains the db itself and all assorted settings. |
@@ -111,11 +104,11 @@ When using volumes (`-v` flags) permissions issues can arise between the host OS
111104

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

114-
In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below:
107+
In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
115108

116109
```
117110
$ id username
118-
uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
111+
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
119112
```
120113

121114

@@ -158,9 +151,20 @@ Below are the instructions for updating containers:
158151
* Start the new container: `docker start mariadb`
159152
* You can also remove the old dangling images: `docker image prune`
160153

154+
### Via Taisun auto-updater (especially useful if you don't remember the original parameters)
155+
* Pull the latest image at its tag and replace it with the same env variables in one shot:
156+
```
157+
docker run --rm \
158+
-v /var/run/docker.sock:/var/run/docker.sock taisun/updater \
159+
--oneshot mariadb
160+
```
161+
* You can also remove the old dangling images: `docker image prune`
162+
161163
### Via Docker Compose
162-
* Update the image: `docker-compose pull linuxserver/mariadb`
163-
* Let compose update containers as necessary: `docker-compose up -d`
164+
* Update all images: `docker-compose pull`
165+
* or update a single image: `docker-compose pull mariadb`
166+
* Let compose update all containers as necessary: `docker-compose up -d`
167+
* or update a single container: `docker-compose up -d mariadb`
164168
* You can also remove the old dangling images: `docker image prune`
165169

166170
## Versions

0 commit comments

Comments
 (0)