Push cnab-app-base image as a multi-arch image with linux-amd64 and linux-arm64 platforms.

silvin-lubecki · silvin-lubecki · commit 8ec5d257ed58 · 2019-12-09T11:10:24.000+01:00
Signed-off-by: Silvin Lubecki &lt;silvin.lubecki@docker.com&gt;
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -75,7 +75,7 @@
                         dir('src/github.com/docker/app') {
                             checkout scm
                             ansiColor('xterm') {
-                                sh 'make -f docker.Makefile save-invocation-image'
+                                sh 'make -f docker.Makefile invocation-image save-invocation-image'
                                 sh 'make -f docker.Makefile INVOCATION_IMAGE_TAG=$TAG-coverage OUTPUT=coverage-invocation-image.tar save-invocation-image-tag'
                             }
                             dir('_build') {
diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette
@@ -65,19 +65,21 @@ pipeline {
                         dir('src/github.com/docker/app') {
                             checkout scm
                             ansiColor('xterm') {
-                                sh 'make -f docker.Makefile save-invocation-image'
+                                sh 'make -f docker.Makefile invocation-image-cross save-invocation-image-cross'
                                 sh 'make -f docker.Makefile save-invocation-image-tag INVOCATION_IMAGE_TAG=$TAG-coverage OUTPUT=coverage-invocation-image.tar'
                             }
                             dir('_build') {
                                 stash name: 'invocation-image', includes: 'invocation-image.tar'
+                                stash name: 'invocation-image-arm64', includes: 'invocation-image-arm64.tar'
                                 stash name: 'coverage-invocation-image', includes: 'coverage-invocation-image.tar'
-                                archiveArtifacts 'invocation-image.tar'
+                                archiveArtifacts 'invocation-image*.tar'
                             }
                         }
                     }
                     post {
                         always {
                             sh 'docker rmi docker/cnab-app-base:$TAG'
+                            sh 'docker rmi docker/cnab-app-base:$TAG-arm64'
                             sh 'docker rmi docker/cnab-app-base:$TAG-coverage'
                             deleteDir()
                         }
@@ -250,6 +252,8 @@ pipeline {
                     dir('_build') {
                         unstash "invocation-image"
                         sh 'docker load -i invocation-image.tar'
+                        unstash "invocation-image-arm64"
+                        sh 'docker load -i invocation-image-arm64.tar'
                     }
                     ansiColor('xterm') {
                         sh 'make -f docker.Makefile push-invocation-image'
@@ -264,6 +268,7 @@ pipeline {
             post {
                 always {
                     sh 'docker rmi docker/cnab-app-base:$TAG'
+                    sh 'docker rmi docker/cnab-app-base:$TAG-arm64'
                     deleteDir()
                 }
             }
diff --git a/docker.Makefile b/docker.Makefile
@@ -20,7 +20,7 @@ PKG_PATH := /go/src/$(PKG_NAME)
 
 
 CNAB_BASE_INVOCATION_IMAGE_NAME := docker/cnab-app-base:$(BUILD_TAG)
-CNAB_BASE_INVOCATION_IMAGE_PATH := _build/invocation-image.tar
+CNAB_BASE_INVOCATION_IMAGE_PATH := _build/invocation-image
 
 PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME := docker/cnab-app-base:$(TAG)
 
@@ -121,21 +121,36 @@ specification/bindata.go: specification/schemas/*.json build_dev_image
 schemas: specification/bindata.go ## generate specification/bindata.go from json schemas
 
 invocation-image:
-	docker build -f Dockerfile.invocation-image $(BUILD_ARGS) --target=invocation -t $(CNAB_BASE_INVOCATION_IMAGE_NAME) .
+	docker build -f Dockerfile.invocation-image $(BUILD_ARGS) --target=invocation -t $(CNAB_BASE_INVOCATION_IMAGE_NAME) -t $(CNAB_BASE_INVOCATION_IMAGE_NAME)-amd64 --platform=amd64 .
+
+invocation-image-arm64:
+	docker build -f Dockerfile.invocation-image $(BUILD_ARGS) --target=invocation -t $(CNAB_BASE_INVOCATION_IMAGE_NAME)-arm64 --platform=arm64 .
+
+invocation-image-cross: invocation-image invocation-image-arm64
 
 save-invocation-image-tag:
 	docker tag $(CNAB_BASE_INVOCATION_IMAGE_NAME) docker/cnab-app-base:$(INVOCATION_IMAGE_TAG)
 	docker save docker/cnab-app-base:$(INVOCATION_IMAGE_TAG) -o _build/$(OUTPUT)
 
-save-invocation-image: invocation-image
+save-invocation-image:
 	@$(call mkdir,_build)
-	docker save $(CNAB_BASE_INVOCATION_IMAGE_NAME) -o $(CNAB_BASE_INVOCATION_IMAGE_PATH)
+	docker save $(CNAB_BASE_INVOCATION_IMAGE_NAME) -o $(CNAB_BASE_INVOCATION_IMAGE_PATH).tar
+
+save-invocation-image-cross: save-invocation-image
+	docker save $(CNAB_BASE_INVOCATION_IMAGE_NAME)-arm64 -o $(CNAB_BASE_INVOCATION_IMAGE_PATH)-arm64.tar
 
 push-invocation-image:
+	# tag and push linux/amd64
 	docker tag $(CNAB_BASE_INVOCATION_IMAGE_NAME) $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME)
 	docker push $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME)
+	# tag and push linux/arm64
+	docker tag $(CNAB_BASE_INVOCATION_IMAGE_NAME)-arm64 $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME)-arm64
+	docker push $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME)-arm64
+	# create and push manifest list
+	docker manifest create $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME) $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME) $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME)-arm64
+	docker manifest push $(PUSH_CNAB_BASE_INVOCATION_IMAGE_NAME)
 
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort
 
-.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage coverage-run coverage-results shell build_dev_image tars vendor check-vendor schemas help invocation-image save-invocation-image save-invocation-image-tag push-invocation-image
+.PHONY: lint test-e2e test-unit test cli-cross cross e2e-cross coverage coverage-run coverage-results shell build_dev_image tars vendor check-vendor schemas help invocation-image invocation-image-arm64 invocation-image-cross save-invocation-image save-invocation-image-tag push-invocation-image

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`dir('src/github.com/docker/app') {`
`76`	`76`	`checkout scm`
`77`	`77`	`ansiColor('xterm') {`
`78`		`- sh 'make -f docker.Makefile save-invocation-image'`
	`78`	`+ sh 'make -f docker.Makefile invocation-image save-invocation-image'`
`79`	`79`	`sh 'make -f docker.Makefile INVOCATION_IMAGE_TAG=$TAG-coverage OUTPUT=coverage-invocation-image.tar save-invocation-image-tag'`
`80`	`80`	`}`
`81`	`81`	`dir('_build') {`
Original file line number	Diff line number	Diff line change
`@@ -65,19 +65,21 @@ pipeline {`
`65`	`65`	`dir('src/github.com/docker/app') {`
`66`	`66`	`checkout scm`
`67`	`67`	`ansiColor('xterm') {`
`68`		`- sh 'make -f docker.Makefile save-invocation-image'`
	`68`	`+ sh 'make -f docker.Makefile invocation-image-cross save-invocation-image-cross'`
`69`	`69`	`sh 'make -f docker.Makefile save-invocation-image-tag INVOCATION_IMAGE_TAG=$TAG-coverage OUTPUT=coverage-invocation-image.tar'`
`70`	`70`	`}`
`71`	`71`	`dir('_build') {`
`72`	`72`	`stash name: 'invocation-image', includes: 'invocation-image.tar'`
	`73`	`+ stash name: 'invocation-image-arm64', includes: 'invocation-image-arm64.tar'`
`73`	`74`	`stash name: 'coverage-invocation-image', includes: 'coverage-invocation-image.tar'`
`74`		`- archiveArtifacts 'invocation-image.tar'`
	`75`	`+ archiveArtifacts 'invocation-image*.tar'`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`	`}`
`78`	`79`	`post {`
`79`	`80`	`always {`
`80`	`81`	`sh 'docker rmi docker/cnab-app-base:$TAG'`
	`82`	`+ sh 'docker rmi docker/cnab-app-base:$TAG-arm64'`
`81`	`83`	`sh 'docker rmi docker/cnab-app-base:$TAG-coverage'`
`82`	`84`	`deleteDir()`
`83`	`85`	`}`
`@@ -250,6 +252,8 @@ pipeline {`
`250`	`252`	`dir('_build') {`
`251`	`253`	`unstash "invocation-image"`
`252`	`254`	`sh 'docker load -i invocation-image.tar'`
	`255`	`+ unstash "invocation-image-arm64"`
	`256`	`+ sh 'docker load -i invocation-image-arm64.tar'`
`253`	`257`	`}`
`254`	`258`	`ansiColor('xterm') {`
`255`	`259`	`sh 'make -f docker.Makefile push-invocation-image'`
`@@ -264,6 +268,7 @@ pipeline {`
`264`	`268`	`post {`
`265`	`269`	`always {`
`266`	`270`	`sh 'docker rmi docker/cnab-app-base:$TAG'`
	`271`	`+ sh 'docker rmi docker/cnab-app-base:$TAG-arm64'`
`267`	`272`	`deleteDir()`
`268`	`273`	`}`
`269`	`274`	`}`