mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #40669 from thaJeztah/switch-to-s390x-ubuntu-1804
Switch to s390x Ubuntu 18.04 (carry 40663)
This commit is contained in:
commit
b084ccda9d
1 changed files with 4 additions and 18 deletions
22
Jenkinsfile
vendored
22
Jenkinsfile
vendored
|
@ -474,13 +474,7 @@ pipeline {
|
||||||
beforeAgent true
|
beforeAgent true
|
||||||
expression { params.s390x }
|
expression { params.s390x }
|
||||||
}
|
}
|
||||||
agent { label 's390x-ubuntu-1604' }
|
agent { label 's390x-ubuntu-1804' }
|
||||||
// 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'
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
stage("Print info") {
|
stage("Print info") {
|
||||||
|
@ -497,8 +491,7 @@ pipeline {
|
||||||
stage("Build dev image") {
|
stage("Build dev image") {
|
||||||
steps {
|
steps {
|
||||||
sh '''
|
sh '''
|
||||||
make bundles/buildx
|
docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
||||||
bundles/buildx build --load --force-rm --build-arg APT_MIRROR=${APT_MIRROR} -t docker:${GIT_COMMIT} .
|
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -587,13 +580,7 @@ pipeline {
|
||||||
not { changeRequest() }
|
not { changeRequest() }
|
||||||
expression { params.s390x }
|
expression { params.s390x }
|
||||||
}
|
}
|
||||||
agent { label 's390x-ubuntu-1604' }
|
agent { label 's390x-ubuntu-1804' }
|
||||||
// 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'
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
stage("Print info") {
|
stage("Print info") {
|
||||||
|
@ -610,8 +597,7 @@ pipeline {
|
||||||
stage("Build dev image") {
|
stage("Build dev image") {
|
||||||
steps {
|
steps {
|
||||||
sh '''
|
sh '''
|
||||||
make bundles/buildx
|
docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
||||||
bundles/buildx build --load --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue