kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #40669 from thaJeztah/switch-to-s390x-ubuntu-1804

Browse source 
Switch to s390x Ubuntu 18.04 (carry 40663)
This commit is contained in:
Sebastiaan van Stijn 2020-03-11 23:26:13 +01:00 committed by GitHub
commit b084ccda9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Jenkinsfile vendored
View file

@ -474,13 +474,7 @@ pipeline {
beforeAgent true
expression { params.s390x }
}
agent { label 's390x-ubuntu-1604' }
// s390x machines run on Docker 18.06, and buildkit has some
// bugs on that version. Build and use buildx instead.
environment {
USE_BUILDX = '1'
DOCKER_BUILDKIT = '0'
}
agent { label 's390x-ubuntu-1804' }
stages {
stage("Print info") {
@ -497,8 +491,7 @@ pipeline {
stage("Build dev image") {
steps {
sh '''
make bundles/buildx
bundles/buildx build --load --force-rm --build-arg APT_MIRROR=${APT_MIRROR} -t docker:${GIT_COMMIT} .
docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
'''
}
}
@ -587,13 +580,7 @@ pipeline {
not { changeRequest() }
expression { params.s390x }
}
agent { label 's390x-ubuntu-1604' }
// s390x machines run on Docker 18.06, and buildkit has some
// bugs on that version. Build and use buildx instead.
environment {
USE_BUILDX = '1'
DOCKER_BUILDKIT = '0'
}
agent { label 's390x-ubuntu-1804' }
stages {
stage("Print info") {
@ -610,8 +597,7 @@ pipeline {
stage("Build dev image") {
steps {
sh '''
make bundles/buildx
bundles/buildx build --load --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
'''
}
}