@@ -42,7 +42,7 @@ pipeline {
42
42
script{
43
43
env. EXIT_STATUS = ' '
44
44
env. LS_RELEASE = sh(
45
- script : ''' docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\ -ls' || : ''' ,
45
+ 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' || : ''' ,
46
46
returnStdout : true ). trim()
47
47
env. LS_RELEASE_NOTES = sh(
48
48
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' ''' ,
@@ -150,13 +150,13 @@ pipeline {
150
150
env. GITLABIMAGE = ' registry.gitlab.com/linuxserver.io/' + env. LS_REPO + ' /' + env. CONTAINER_NAME
151
151
env. QUAYIMAGE = ' quay.io/linuxserver.io/' + env. CONTAINER_NAME
152
152
if (env. MULTIARCH == ' true' ) {
153
- env. CI_TAGS = ' amd64-' + env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER + ' |arm32v7-' + env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER + ' |arm64v8-' + env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
153
+ 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
154
154
} else {
155
- env. CI_TAGS = env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
155
+ env. CI_TAGS = ' focal- ' + env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
156
156
}
157
157
env. VERSION_TAG = env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
158
- env. META_TAG = env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
159
- env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
158
+ env. META_TAG = ' focal- ' + env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
159
+ env. EXT_RELEASE_TAG = ' focal- version-' + env. EXT_RELEASE_CLEAN
160
160
}
161
161
}
162
162
}
@@ -173,13 +173,13 @@ pipeline {
173
173
env. GITLABIMAGE = ' registry.gitlab.com/linuxserver.io/' + env. LS_REPO + ' /lsiodev-' + env. CONTAINER_NAME
174
174
env. QUAYIMAGE = ' quay.io/linuxserver.io/lsiodev-' + env. CONTAINER_NAME
175
175
if (env. MULTIARCH == ' true' ) {
176
- env. CI_TAGS = ' amd64-' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -dev-' + env. COMMIT_SHA + ' |arm32v7-' + 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
176
+ 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
177
177
} else {
178
- env. CI_TAGS = env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -dev-' + env. COMMIT_SHA
178
+ env. CI_TAGS = ' focal- ' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -dev-' + env. COMMIT_SHA
179
179
}
180
180
env. VERSION_TAG = env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -dev-' + env. COMMIT_SHA
181
- env. META_TAG = env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -dev-' + env. COMMIT_SHA
182
- env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
181
+ env. META_TAG = ' focal- ' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -dev-' + env. COMMIT_SHA
182
+ env. EXT_RELEASE_TAG = ' focal- version-' + env. EXT_RELEASE_CLEAN
183
183
env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DEV_DOCKERHUB_IMAGE + ' /tags/'
184
184
}
185
185
}
@@ -196,13 +196,13 @@ pipeline {
196
196
env. GITLABIMAGE = ' registry.gitlab.com/linuxserver.io/' + env. LS_REPO + ' /lspipepr-' + env. CONTAINER_NAME
197
197
env. QUAYIMAGE = ' quay.io/linuxserver.io/lspipepr-' + env. CONTAINER_NAME
198
198
if (env. MULTIARCH == ' true' ) {
199
- env. CI_TAGS = ' amd64-' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST + ' |arm32v7-' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST + ' |arm64v8-' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST
199
+ 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
200
200
} else {
201
- env. CI_TAGS = env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST
201
+ env. CI_TAGS = ' focal- ' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST
202
202
}
203
203
env. VERSION_TAG = env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST
204
- env. META_TAG = env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST
205
- env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
204
+ env. META_TAG = ' focal- ' + env. EXT_RELEASE_CLEAN + ' -pkg-' + env. PACKAGE_TAG + ' -pr-' + env. PULL_REQUEST
205
+ env. EXT_RELEASE_TAG = ' focal- version-' + env. EXT_RELEASE_CLEAN
206
206
env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /pull/' + env. PULL_REQUEST
207
207
env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. PR_DOCKERHUB_IMAGE + ' /tags/'
208
208
}
@@ -750,10 +750,10 @@ pipeline {
750
750
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
751
751
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
752
752
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
753
- docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
753
+ docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:focal
754
754
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
755
755
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
756
- docker push ${PUSHIMAGE}:latest
756
+ docker push ${PUSHIMAGE}:focal
757
757
docker push ${PUSHIMAGE}:${META_TAG}
758
758
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
759
759
docker push ${PUSHIMAGE}:${SEMVER}
@@ -765,7 +765,7 @@ pipeline {
765
765
docker rmi \
766
766
${DELETEIMAGE}:${META_TAG} \
767
767
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
768
- ${DELETEIMAGE}:latest \
768
+ ${DELETEIMAGE}:focal \
769
769
${DELETEIMAGE}:${SEMVER} || :
770
770
done
771
771
'''
@@ -810,9 +810,9 @@ pipeline {
810
810
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
811
811
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
812
812
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
813
- docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
814
- docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
815
- docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
813
+ docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-focal
814
+ docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-focal
815
+ docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-focal
816
816
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
817
817
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
818
818
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
@@ -822,19 +822,19 @@ pipeline {
822
822
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
823
823
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
824
824
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
825
- docker push ${MANIFESTIMAGE}:amd64-latest
826
- docker push ${MANIFESTIMAGE}:arm32v7-latest
827
- docker push ${MANIFESTIMAGE}:arm64v8-latest
825
+ docker push ${MANIFESTIMAGE}:amd64-focal
826
+ docker push ${MANIFESTIMAGE}:arm32v7-focal
827
+ docker push ${MANIFESTIMAGE}:arm64v8-focal
828
828
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
829
829
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
830
830
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
831
831
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
832
832
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
833
833
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
834
- docker manifest push --purge ${MANIFESTIMAGE}:latest || :
835
- docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
836
- docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
837
- docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
834
+ docker manifest push --purge ${MANIFESTIMAGE}:focal || :
835
+ docker manifest create ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:amd64-focal ${MANIFESTIMAGE}:arm32v7-focal ${MANIFESTIMAGE}:arm64v8-focal
836
+ docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm32v7-focal --os linux --arch arm
837
+ docker manifest annotate ${MANIFESTIMAGE}:focal ${MANIFESTIMAGE}:arm64v8-focal --os linux --arch arm64 --variant v8
838
838
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
839
839
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
840
840
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
@@ -847,7 +847,7 @@ pipeline {
847
847
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
848
848
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
849
849
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
850
- docker manifest push --purge ${MANIFESTIMAGE}:latest
850
+ docker manifest push --purge ${MANIFESTIMAGE}:focal
851
851
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
852
852
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
853
853
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
@@ -858,15 +858,15 @@ pipeline {
858
858
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
859
859
docker rmi \
860
860
${DELETEIMAGE}:amd64-${META_TAG} \
861
- ${DELETEIMAGE}:amd64-latest \
861
+ ${DELETEIMAGE}:amd64-focal \
862
862
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
863
863
${DELETEIMAGE}:amd64-${SEMVER} \
864
864
${DELETEIMAGE}:arm32v7-${META_TAG} \
865
- ${DELETEIMAGE}:arm32v7-latest \
865
+ ${DELETEIMAGE}:arm32v7-focal \
866
866
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
867
867
${DELETEIMAGE}:arm32v7-${SEMVER} \
868
868
${DELETEIMAGE}:arm64v8-${META_TAG} \
869
- ${DELETEIMAGE}:arm64v8-latest \
869
+ ${DELETEIMAGE}:arm64v8-focal \
870
870
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
871
871
${DELETEIMAGE}:arm64v8-${SEMVER} || :
872
872
done
0 commit comments