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

Commit 5ca6b37

Browse files
aptalcathelamer
aptalca
authored and
thelamer
committed
switch docker image tag to xenial-5.14, in line with bionic-5.14
1 parent e1f3e47 commit 5ca6b37

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎Jenkinsfile‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ pipeline {
205205
environment name: 'EXIT_STATUS', value: ''
206206
}
207207
steps {
208-
sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \
208+
sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \
209209
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
210210
}
211211
}
@@ -218,7 +218,7 @@ pipeline {
218218
parallel {
219219
stage('Build X86') {
220220
steps {
221-
sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \
221+
sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
222222
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
223223
}
224224
}
@@ -241,7 +241,7 @@ pipeline {
241241
'''
242242
sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static"
243243
sh "chmod +x qemu-*"
244-
sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
244+
sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
245245
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
246246
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
247247
sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -270,7 +270,7 @@ pipeline {
270270
'''
271271
sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static"
272272
sh "chmod +x qemu-*"
273-
sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
273+
sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
274274
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
275275
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
276276
sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -435,12 +435,12 @@ pipeline {
435435
sh '''#! /bin/bash
436436
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
437437
'''
438-
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:5.14"
439-
sh "docker push ${IMAGE}:5.14"
438+
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:xenial-5.14"
439+
sh "docker push ${IMAGE}:xenial-5.14"
440440
sh "docker push ${IMAGE}:${META_TAG}"
441441
sh '''docker rmi \
442442
${IMAGE}:${META_TAG} \
443-
${IMAGE}:5.14 '''
443+
${IMAGE}:xenial-5.14 '''
444444

445445
}
446446
}
@@ -470,32 +470,32 @@ pipeline {
470470
docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
471471
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
472472
fi'''
473-
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-5.14"
474-
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-5.14"
475-
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-5.14"
473+
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-xenial-5.14"
474+
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-xenial-5.14"
475+
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-xenial-5.14"
476476
sh "docker push ${IMAGE}:amd64-${META_TAG}"
477477
sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
478478
sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
479-
sh "docker push ${IMAGE}:amd64-5.14"
480-
sh "docker push ${IMAGE}:arm32v7-5.14"
481-
sh "docker push ${IMAGE}:arm64v8-5.14"
482-
sh "docker manifest push --purge ${IMAGE}:5.14 || :"
483-
sh "docker manifest create ${IMAGE}:5.14 ${IMAGE}:amd64-5.14 ${IMAGE}:arm32v7-5.14 ${IMAGE}:arm64v8-5.14"
484-
sh "docker manifest annotate ${IMAGE}:5.14 ${IMAGE}:arm32v7-5.14 --os linux --arch arm"
485-
sh "docker manifest annotate ${IMAGE}:5.14 ${IMAGE}:arm64v8-5.14 --os linux --arch arm64 --variant v8"
479+
sh "docker push ${IMAGE}:amd64-xenial-5.14"
480+
sh "docker push ${IMAGE}:arm32v7-xenial-5.14"
481+
sh "docker push ${IMAGE}:arm64v8-xenial-5.14"
482+
sh "docker manifest push --purge ${IMAGE}:xenial-5.14 || :"
483+
sh "docker manifest create ${IMAGE}:xenial-5.14 ${IMAGE}:amd64-xenial-5.14 ${IMAGE}:arm32v7-xenial-5.14 ${IMAGE}:arm64v8-xenial-5.14"
484+
sh "docker manifest annotate ${IMAGE}:xenial-5.14 ${IMAGE}:arm32v7-xenial-5.14 --os linux --arch arm"
485+
sh "docker manifest annotate ${IMAGE}:xenial-5.14 ${IMAGE}:arm64v8-xenial-5.14 --os linux --arch arm64 --variant v8"
486486
sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
487487
sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
488488
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
489489
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
490-
sh "docker manifest push --purge ${IMAGE}:5.14"
490+
sh "docker manifest push --purge ${IMAGE}:xenial-5.14"
491491
sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
492492
sh '''docker rmi \
493493
${IMAGE}:amd64-${META_TAG} \
494-
${IMAGE}:amd64-5.14 \
494+
${IMAGE}:amd64-xenial-5.14 \
495495
${IMAGE}:arm32v7-${META_TAG} \
496-
${IMAGE}:arm32v7-5.14 \
496+
${IMAGE}:arm32v7-xenial-5.14 \
497497
${IMAGE}:arm64v8-${META_TAG} \
498-
${IMAGE}:arm64v8-5.14 \
498+
${IMAGE}:arm64v8-xenial-5.14 \
499499
lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
500500
lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} '''
501501
}

‎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-mono
55
external_type: os
66
release_type: prerelease
7-
release_tag: 5.14
7+
release_tag: xenial-5.14
88
ls_branch: 5.14
99
repo_vars:
1010
- BUILD_VERSION_ARG = 'MONO_VERSION'

0 commit comments

Comments
 (0)