mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Jenkinsfile: Z/Power: use buildx
Z and Power does not currently work with buildkit so use buildx instead. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
parent
833444c0d6
commit
c04ea1133d
1 changed files with 12 additions and 4 deletions
16
Jenkinsfile
vendored
16
Jenkinsfile
vendored
|
@ -392,7 +392,8 @@ pipeline {
|
||||||
stage("Build dev image") {
|
stage("Build dev image") {
|
||||||
steps {
|
steps {
|
||||||
sh '''
|
sh '''
|
||||||
docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
make bundles/buildx
|
||||||
|
bundles/buildx build --load --force-rm --build-arg APT_MIRROR=${APT_MIRROR} -t docker:${GIT_COMMIT} .
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -500,7 +501,8 @@ pipeline {
|
||||||
stage("Build dev image") {
|
stage("Build dev image") {
|
||||||
steps {
|
steps {
|
||||||
sh '''
|
sh '''
|
||||||
docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
make bundles/buildx
|
||||||
|
bundles/buidx build --load --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -583,7 +585,10 @@ pipeline {
|
||||||
}
|
}
|
||||||
stage("Build dev image") {
|
stage("Build dev image") {
|
||||||
steps {
|
steps {
|
||||||
sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'
|
sh '''
|
||||||
|
make bundles/buildx
|
||||||
|
bundles/buildx build --load --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
||||||
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage("Unit tests") {
|
stage("Unit tests") {
|
||||||
|
@ -689,7 +694,10 @@ pipeline {
|
||||||
}
|
}
|
||||||
stage("Build dev image") {
|
stage("Build dev image") {
|
||||||
steps {
|
steps {
|
||||||
sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'
|
sh '''
|
||||||
|
make bundles/buildx
|
||||||
|
bundles/buildx build --load --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .
|
||||||
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage("Integration-cli tests") {
|
stage("Integration-cli tests") {
|
||||||
|
|
Loading…
Reference in a new issue