Skip to content

Commit 5bf0894

Browse files
thelamerthelamer
committed
use latest not master for tag
1 parent 8c5689f commit 5bf0894

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎Jenkinsfile‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pipeline {
7676
script{
7777
env.EXIT_STATUS = ''
7878
env.LS_RELEASE = sh(
79-
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:master 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
79+
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
8080
returnStdout: true).trim()
8181
env.LS_RELEASE_NOTES = sh(
8282
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' ''',
@@ -109,7 +109,7 @@ pipeline {
109109
script{
110110
env.LS_TAG_NUMBER = sh(
111111
script: '''#! /bin/bash
112-
tagsha=$(git rev-list -n 1 master-${LS_RELEASE} 2>/dev/null)
112+
tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
113113
if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
114114
echo ${LS_RELEASE_NUMBER}
115115
elif [ -z "${GIT_COMMIT}" ]; then
@@ -198,13 +198,13 @@ pipeline {
198198
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
199199
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
200200
if (env.MULTIARCH == 'true') {
201-
env.CI_TAGS = 'amd64-master-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-master-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
201+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
202202
} else {
203-
env.CI_TAGS = 'master-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
203+
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
204204
}
205205
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
206-
env.META_TAG = 'master-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207-
env.EXT_RELEASE_TAG = 'master-version-' + env.EXT_RELEASE_CLEAN
206+
env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207+
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
208208
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
209209
env.CITEST_IMAGETAG = 'latest'
210210
}
@@ -223,13 +223,13 @@ pipeline {
223223
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
224224
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
225225
if (env.MULTIARCH == 'true') {
226-
env.CI_TAGS = 'amd64-master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
226+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
227227
} else {
228-
env.CI_TAGS = 'master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
228+
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
229229
}
230230
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
231-
env.META_TAG = 'master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
232-
env.EXT_RELEASE_TAG = 'master-version-' + env.EXT_RELEASE_CLEAN
231+
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
232+
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
233233
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
234234
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
235235
env.CITEST_IMAGETAG = 'develop'
@@ -248,13 +248,13 @@ pipeline {
248248
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
249249
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
250250
if (env.MULTIARCH == 'true') {
251-
env.CI_TAGS = 'amd64-master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
251+
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
252252
} else {
253-
env.CI_TAGS = 'master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
253+
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
254254
}
255255
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
256-
env.META_TAG = 'master-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
257-
env.EXT_RELEASE_TAG = 'master-version-' + env.EXT_RELEASE_CLEAN
256+
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
257+
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
258258
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
259259
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
260260
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
@@ -362,9 +362,9 @@ pipeline {
362362
sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
363363
fi
364364
mkdir -p ${TEMPDIR}/d2
365-
docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:master
365+
docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest
366366
ls -al ${TEMPDIR}/d2
367-
yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-master.d2\\")" readme-vars.yml
367+
yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml
368368
if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
369369
echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
370370
mkdir -p ${TEMPDIR}/repo
@@ -892,7 +892,7 @@ pipeline {
892892
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
893893
-e TAGS=\"${CI_TAGS}\" \
894894
-e META_TAG=\"${META_TAG}\" \
895-
-e RELEASE_TAG=\"master\" \
895+
-e RELEASE_TAG=\"latest\" \
896896
-e PORT=\"${CI_PORT}\" \
897897
-e SSL=\"${CI_SSL}\" \
898898
-e BASE=\"${DIST_IMAGE}\" \
@@ -932,7 +932,7 @@ pipeline {
932932
CACHEIMAGE=${i}
933933
fi
934934
done
935-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:master -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
935+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
936936
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
937937
if [ -n "${SEMVER}" ]; then
938938
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
@@ -961,9 +961,9 @@ pipeline {
961961
CACHEIMAGE=${i}
962962
fi
963963
done
964-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-master -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
964+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
965965
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
966-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-master -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
966+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
967967
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
968968
if [ -n "${SEMVER}" ]; then
969969
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
@@ -973,7 +973,7 @@ pipeline {
973973
fi
974974
done
975975
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
976-
docker buildx imagetools create -t ${MANIFESTIMAGE}:master ${MANIFESTIMAGE}:amd64-master ${MANIFESTIMAGE}:arm64v8-master || \
976+
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
977977
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
978978
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
979979
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Find us at:
3535
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/webstation.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/webstation)
3636
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/webstation.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/webstation)
3737
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-webstation%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webstation/job/master/)
38-
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fwebstation%2Fmaster%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/webstation/master/index.html)
38+
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fwebstation%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/webstation/latest/index.html)
3939

4040
[Webstation](https://github.com/linuxserver/docker-webstation) is a web native emulation focused LXQt desktop based on Ubuntu.
4141

@@ -45,7 +45,7 @@ Find us at:
4545

4646
We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
4747

48-
Simply pulling `lscr.io/linuxserver/webstation:master` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
48+
Simply pulling `lscr.io/linuxserver/webstation:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
4949

5050
The architectures supported by this image are:
5151

@@ -144,7 +144,7 @@ For Intel and AMD GPUs.
144144
---
145145
services:
146146
webstation:
147-
image: lscr.io/linuxserver/webstation:master
147+
image: lscr.io/linuxserver/webstation:latest
148148
environment:
149149
- PIXELFLUX_WAYLAND=true
150150
# Ensure these point to the rendered node injected by the runtime (usually renderD128)
@@ -407,7 +407,7 @@ To help you get started creating a container from this image you can either use
407407
---
408408
services:
409409
webstation:
410-
image: lscr.io/linuxserver/webstation:master
410+
image: lscr.io/linuxserver/webstation:latest
411411
container_name: webstation
412412
environment:
413413
- PUID=1000
@@ -435,7 +435,7 @@ docker run -d \
435435
-v /path/to/config:/config \
436436
--shm-size="1gb" \
437437
--restart unless-stopped \
438-
lscr.io/linuxserver/webstation:master
438+
lscr.io/linuxserver/webstation:latest
439439
```
440440

441441
## Parameters
@@ -516,7 +516,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
516516
* Image version number:
517517

518518
```bash
519-
docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/webstation:master
519+
docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/webstation:latest
520520
```
521521

522522
## Updating Info
@@ -564,7 +564,7 @@ Below are the instructions for updating containers:
564564
* Update the image:
565565

566566
```bash
567-
docker pull lscr.io/linuxserver/webstation:master
567+
docker pull lscr.io/linuxserver/webstation:latest
568568
```
569569

570570
* Stop the running container:
@@ -601,7 +601,7 @@ cd docker-webstation
601601
docker build \
602602
--no-cache \
603603
--pull \
604-
-t lscr.io/linuxserver/webstation:master .
604+
-t lscr.io/linuxserver/webstation:latest .
605605
```
606606

607607
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

‎jenkins-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
project_name: docker-webstation
55
external_type: os
66
release_type: stable
7-
release_tag: master
7+
release_tag: latest
88
ls_branch: master
99
build_armhf: false
1010
repo_vars:

0 commit comments

Comments
 (0)