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

Commit edc4f24

Browse files
aptalcathelamer
aptalca
authored and
thelamer
committed
publish focal tag from branch master
1 parent 9d6be0a commit edc4f24

File tree

6 files changed

+48
-48
lines changed

6 files changed

+48
-48
lines changed

‎.github/workflows/external_trigger.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "**** External version: ${EXT_RELEASE} ****"
3333
echo "**** Retrieving last pushed version ****"
3434
image="linuxserver/baseimage-rdesktop-web"
35-
tag="bionic"
35+
tag="focal"
3636
token=$(curl -sX GET \
3737
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbaseimage-rdesktop-web%3Apull" \
3838
| jq -r '.token')
@@ -54,7 +54,7 @@ jobs:
5454
IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
5555
if [ -z "${IMAGE_VERSION}" ]; then
5656
echo "**** Can't retrieve last pushed version, exiting ****"
57-
FAILURE_REASON="Can't retrieve last pushed version for baseimage-rdesktop-web tag bionic"
57+
FAILURE_REASON="Can't retrieve last pushed version for baseimage-rdesktop-web tag focal"
5858
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
5959
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
6060
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -85,7 +85,7 @@ jobs:
8585
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
8686
--data-urlencode "Submit=Submit"
8787
echo "**** Notifying Discord ****"
88-
TRIGGER_REASON="A version change was detected for baseimage-rdesktop-web tag bionic. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
88+
TRIGGER_REASON="A version change was detected for baseimage-rdesktop-web tag focal. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
8989
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
9090
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
9191
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

‎Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as builder
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal as builder
22

33
ARG GUACD_VERSION=1.1.0
44

@@ -59,7 +59,7 @@ RUN \
5959
/tmp/out/guacd_${GUACD_VERSION}.deb
6060

6161
# nodejs builder
62-
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic as nodebuilder
62+
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal as nodebuilder
6363
ARG GCLIENT_RELEASE
6464

6565
RUN \
@@ -68,7 +68,7 @@ RUN \
6868
apt-get install -y \
6969
gnupg && \
7070
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
71-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
71+
echo 'deb https://deb.nodesource.com/node_12.x focal main' \
7272
> /etc/apt/sources.list.d/nodesource.list && \
7373
apt-get update && \
7474
apt-get install -y \
@@ -94,7 +94,7 @@ RUN \
9494
npm install
9595

9696
# runtime stage
97-
FROM ghcr.io/linuxserver/baseimage-rdesktop:bionic
97+
FROM ghcr.io/linuxserver/baseimage-rdesktop:focal
9898

9999
# set version label
100100
ARG BUILD_DATE
@@ -116,7 +116,7 @@ RUN \
116116
apt-get install -y \
117117
gnupg && \
118118
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
119-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
119+
echo 'deb https://deb.nodesource.com/node_12.x focal main' \
120120
> /etc/apt/sources.list.d/nodesource.list && \
121121
apt-get update && \
122122
DEBIAN_FRONTEND=noninteractive \

‎Dockerfile.aarch64‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as builder
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal as builder
22

33
ARG GUACD_VERSION=1.1.0
44

@@ -59,7 +59,7 @@ RUN \
5959
/tmp/out/guacd_${GUACD_VERSION}.deb
6060

6161
# nodejs builder
62-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic as nodebuilder
62+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal as nodebuilder
6363
ARG GCLIENT_RELEASE
6464

6565
RUN \
@@ -68,7 +68,7 @@ RUN \
6868
apt-get install -y \
6969
gnupg && \
7070
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
71-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
71+
echo 'deb https://deb.nodesource.com/node_12.x focal main' \
7272
> /etc/apt/sources.list.d/nodesource.list && \
7373
apt-get update && \
7474
apt-get install -y \
@@ -94,7 +94,7 @@ RUN \
9494
npm install
9595

9696
# runtime stage
97-
FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-bionic
97+
FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-focal
9898

9999
# set version label
100100
ARG BUILD_DATE
@@ -116,7 +116,7 @@ RUN \
116116
apt-get install -y \
117117
gnupg && \
118118
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
119-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
119+
echo 'deb https://deb.nodesource.com/node_12.x focal main' \
120120
> /etc/apt/sources.list.d/nodesource.list && \
121121
apt-get update && \
122122
DEBIAN_FRONTEND=noninteractive \

‎Dockerfile.armhf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic as builder
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal as builder
22

33
ARG GUACD_VERSION=1.1.0
44

@@ -59,7 +59,7 @@ RUN \
5959
/tmp/out/guacd_${GUACD_VERSION}.deb
6060

6161
# nodejs builder
62-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic as nodebuilder
62+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal as nodebuilder
6363
ARG GCLIENT_RELEASE
6464

6565
RUN \
@@ -68,7 +68,7 @@ RUN \
6868
apt-get install -y \
6969
gnupg && \
7070
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
71-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
71+
echo 'deb https://deb.nodesource.com/node_12.x focal main' \
7272
> /etc/apt/sources.list.d/nodesource.list && \
7373
apt-get update && \
7474
apt-get install -y \
@@ -94,7 +94,7 @@ RUN \
9494
npm install
9595

9696
# runtime stage
97-
FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-bionic
97+
FROM ghcr.io/linuxserver/baseimage-rdesktop:arm32v7-focal
9898

9999
# set version label
100100
ARG BUILD_DATE
@@ -116,7 +116,7 @@ RUN \
116116
apt-get install -y \
117117
gnupg && \
118118
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
119-
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
119+
echo 'deb https://deb.nodesource.com/node_12.x focal main' \
120120
> /etc/apt/sources.list.d/nodesource.list && \
121121
apt-get update && \
122122
DEBIAN_FRONTEND=noninteractive \

‎Jenkinsfile‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pipeline {
4444
script{
4545
env.EXIT_STATUS = ''
4646
env.LS_RELEASE = sh(
47-
script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':bionic 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
47+
script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':focal 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
4848
returnStdout: true).trim()
4949
env.LS_RELEASE_NOTES = sh(
5050
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' ''',
@@ -141,13 +141,13 @@ pipeline {
141141
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
142142
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
143143
if (env.MULTIARCH == 'true') {
144-
env.CI_TAGS = 'amd64-bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
144+
env.CI_TAGS = 'amd64-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
145145
} else {
146-
env.CI_TAGS = 'bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
146+
env.CI_TAGS = 'focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
147147
}
148148
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
149-
env.META_TAG = 'bionic-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
150-
env.EXT_RELEASE_TAG = 'bionic-version-' + env.EXT_RELEASE_CLEAN
149+
env.META_TAG = 'focal-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
150+
env.EXT_RELEASE_TAG = 'focal-version-' + env.EXT_RELEASE_CLEAN
151151
}
152152
}
153153
}
@@ -163,13 +163,13 @@ pipeline {
163163
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
164164
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
165165
if (env.MULTIARCH == 'true') {
166-
env.CI_TAGS = 'amd64-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
166+
env.CI_TAGS = 'amd64-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
167167
} else {
168-
env.CI_TAGS = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
168+
env.CI_TAGS = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
169169
}
170170
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
171-
env.META_TAG = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
172-
env.EXT_RELEASE_TAG = 'bionic-version-' + env.EXT_RELEASE_CLEAN
171+
env.META_TAG = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
172+
env.EXT_RELEASE_TAG = 'focal-version-' + env.EXT_RELEASE_CLEAN
173173
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
174174
}
175175
}
@@ -185,13 +185,13 @@ pipeline {
185185
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
186186
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
187187
if (env.MULTIARCH == 'true') {
188-
env.CI_TAGS = 'amd64-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
188+
env.CI_TAGS = 'amd64-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
189189
} else {
190-
env.CI_TAGS = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
190+
env.CI_TAGS = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
191191
}
192192
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
193-
env.META_TAG = 'bionic-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
194-
env.EXT_RELEASE_TAG = 'bionic-version-' + env.EXT_RELEASE_CLEAN
193+
env.META_TAG = 'focal-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
194+
env.EXT_RELEASE_TAG = 'focal-version-' + env.EXT_RELEASE_CLEAN
195195
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
196196
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
197197
}
@@ -592,9 +592,9 @@ pipeline {
592592
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
593593
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
594594
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
595-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:bionic
595+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:focal
596596
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
597-
docker push ${PUSHIMAGE}:bionic
597+
docker push ${PUSHIMAGE}:focal
598598
docker push ${PUSHIMAGE}:${META_TAG}
599599
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
600600
done
@@ -605,7 +605,7 @@ pipeline {
605605
docker rmi \
606606
${DELETEIMAGE}:${META_TAG} \
607607
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
608-
${DELETEIMAGE}:bionic || :
608+
${DELETEIMAGE}:focal || :
609609
done
610610
'''
611611
}
@@ -642,25 +642,25 @@ pipeline {
642642
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
643643
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
644644
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
645-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-bionic
646-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-bionic
647-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-bionic
645+
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-focal
646+
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-focal
647+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-focal
648648
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
649649
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
650650
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
651651
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
652652
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
653653
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
654-
docker push ${MANIFESTIMAGE}:amd64-bionic
655-
docker push ${MANIFESTIMAGE}:arm32v7-bionic
656-
docker push ${MANIFESTIMAGE}:arm64v8-bionic
654+
docker push ${MANIFESTIMAGE}:amd64-focal
655+
docker push ${MANIFESTIMAGE}:arm32v7-focal
656+
docker push ${MANIFESTIMAGE}:arm64v8-focal
657657
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
658658
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
659659
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
660-
docker manifest push --purge ${MANIFESTIMAGE}:bionic || :
661-
docker manifest create ${MANIFESTIMAGE}:bionic ${MANIFESTIMAGE}:amd64-bionic ${MANIFESTIMAGE}:arm32v7-bionic ${MANIFESTIMAGE}:arm64v8-bionic
662-
docker manifest annotate ${MANIFESTIMAGE}:bionic ${MANIFESTIMAGE}:arm32v7-bionic --os linux --arch arm
663-
docker manifest annotate ${MANIFESTIMAGE}:bionic ${MANIFESTIMAGE}:arm64v8-bionic --os linux --arch arm64 --variant v8
660+
docker manifest push --purge ${MANIFESTIMAGE}:focal || :
661+
docker manifest create ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:amd64-focal ${MANIFESTIMAGE}:arm32v7-focal ${MANIFESTIMAGE}:arm64v8-focal
662+
docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm32v7-focal --os linux --arch arm
663+
docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm64v8-focal --os linux --arch arm64 --variant v8
664664
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
665665
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
666666
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
@@ -669,7 +669,7 @@ pipeline {
669669
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
670670
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
671671
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
672-
docker manifest push --purge ${MANIFESTIMAGE}:bionic
672+
docker manifest push --purge ${MANIFESTIMAGE}:focal
673673
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
674674
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
675675
done
@@ -679,10 +679,10 @@ pipeline {
679679
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
680680
docker rmi \
681681
${DELETEIMAGE}:arm32v7-${META_TAG} \
682-
${DELETEIMAGE}:arm32v7-bionic \
682+
${DELETEIMAGE}:arm32v7-focal \
683683
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
684684
${DELETEIMAGE}:arm64v8-${META_TAG} \
685-
${DELETEIMAGE}:arm64v8-bionic \
685+
${DELETEIMAGE}:arm64v8-focal \
686686
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
687687
done
688688
docker rmi \

‎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-baseimage-rdesktop-web
55
external_type: github_stable
66
release_type: stable
7-
release_tag: bionic
7+
release_tag: focal
88
ls_branch: master
99
repo_vars:
1010
- EXT_GIT_BRANCH = 'master'

0 commit comments

Comments
 (0)