1. docker
  2. Commit c1102830046bd43d8bf4a9b622f10388c9d91b57
Browse code

Jenkinsfile: use buildx on s390x and ppc64le

Commit 1be2cc2568ddd52a3b27d607a9c9f7c9347d3c50 updated the
Makefile to force the use of BuildKit, if `USE_BUILDX` was
not set.

As a side-effect, Jenkins now started using BuildKit on
s390x and ppc64le as well, because it overwrote the
`DOCKER_BUILDKIT=0` that was set.

This commit forces the use of buildx on s390x and ppc64le.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/10/15 02:22:56
Showing 1 changed files
Jenkinsfile
History View file @ c110283
... ... 
@@ -375,8 +375,12 @@ pipeline {
375 375 
                         expression { params.s390x }
376 376 
                     }
377 377 
                     agent { label 's390x-ubuntu-1604' }
378 
-                    // s390x machines run on Docker 18.06, and buildkit has some bugs on that version
379 
-                    environment { DOCKER_BUILDKIT = '0' }
378 
+                    // s390x machines run on Docker 18.06, and buildkit has some
379 
+                    // bugs on that version. Build and use buildx instead.
380 
+                    environment {
381 
+                        USE_BUILDX      = '1'
382 
+                        DOCKER_BUILDKIT = '0'
383 
+                    }
380 384
381 385 
                     stages {
382 386 
                         stage("Print info") {
... ... 
@@ -484,8 +488,12 @@ pipeline {
484 484 
                         expression { params.s390x }
485 485 
                     }
486 486 
                     agent { label 's390x-ubuntu-1604' }
487 
-                    // s390x machines run on Docker 18.06, and buildkit has some bugs on that version
488 
-                    environment { DOCKER_BUILDKIT = '0' }
487 
+                    // s390x machines run on Docker 18.06, and buildkit has some
488 
+                    // bugs on that version. Build and use buildx instead.
489 
+                    environment {
490 
+                        USE_BUILDX      = '1'
491 
+                        DOCKER_BUILDKIT = '0'
492 
+                    }
489 493
490 494 
                     stages {
491 495 
                         stage("Print info") {
... ... 
@@ -569,8 +577,12 @@ pipeline {
569 569 
                         expression { params.ppc64le }
570 570 
                     }
571 571 
                     agent { label 'ppc64le-ubuntu-1604' }
572 
-                    // ppc64le machines run on Docker 18.06, and buildkit has some bugs on that version
573 
-                    environment { DOCKER_BUILDKIT = '0' }
572 
+                    // ppc64le machines run on Docker 18.06, and buildkit has some
573 
+                    // bugs on that version. Build and use buildx instead.
574 
+                    environment {
575 
+                        USE_BUILDX      = '1'
576 
+                        DOCKER_BUILDKIT = '0'
577 
+                    }
574 578
575 579 
                     stages {
576 580 
                         stage("Print info") {
... ... 
@@ -678,8 +690,12 @@ pipeline {
678 678 
                         expression { params.ppc64le }
679 679 
                     }
680 680 
                     agent { label 'ppc64le-ubuntu-1604' }
681 
-                    // ppc64le machines run on Docker 18.06, and buildkit has some bugs on that version
682 
-                    environment { DOCKER_BUILDKIT = '0' }
681 
+                    // ppc64le machines run on Docker 18.06, and buildkit has some
682 
+                    // bugs on that version. Build and use buildx instead.
683 
+                    environment {
684 
+                        USE_BUILDX      = '1'
685 
+                        DOCKER_BUILDKIT = '0'
686 
+                    }
683 687
684 688 
                     stages {
685 689 
                         stage("Print info") {