Fix saving cnab base image to a global tmp directory and put it in a …

…local git ignored directory (_build). Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
docker · Jan 17, 2019 · 717b21b · 717b21b
1 parent 5812410
commit 717b21b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 49 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -32,25 +32,19 @@ COPY . .
 # FIXME(vdemeester) change from docker-app to dev once buildkit is merged in moby/docker
 FROM dev AS cross
 ARG EXPERIMENTAL="off"
-ARG TAG
-ARG COMMIT
-RUN make EXPERIMENTAL=${EXPERIMENTAL} TAG=${TAG} COMMIT=${COMMIT} cross
+RUN make EXPERIMENTAL=${EXPERIMENTAL} cross
 
 # FIXME(vdemeester) change from docker-app to dev once buildkit is merged in moby/docker
 FROM cross AS e2e-cross
 ARG EXPERIMENTAL="off"
 # Run e2e tests
-ARG TAG
-ARG COMMIT
-RUN make EXPERIMENTAL=${EXPERIMENTAL} TAG=${TAG} COMMIT=${COMMIT} e2e-cross
+RUN make EXPERIMENTAL=${EXPERIMENTAL} e2e-cross
 
 # builder of invocation image entrypoint
 FROM build AS invocation-build
 COPY . .
 ARG EXPERIMENTAL="off"
-ARG TAG
-ARG COMMIT
-RUN make EXPERIMENTAL=${EXPERIMENTAL} TAG=${TAG} COMMIT=${COMMIT} bin/run
+RUN make EXPERIMENTAL=${EXPERIMENTAL} bin/run
 
 # cnab invocation image
 FROM alpine:${ALPINE_VERSION} AS invocation

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -68,7 +68,7 @@ pipeline {
                         dir('src/github.com/docker/app') {
                             checkout scm
                             sh 'make -f docker.Makefile save-invocation-image'
-                            stash name: 'invocation-image', includes: 'invocation-image.tar'
+                            stash name: 'invocation-image', includes: 'invocation-image*.tar'
                         }
                     }
                     post {

diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette
@@ -60,13 +60,8 @@ pipeline {
                         dir('src/github.com/docker/app') {
                             checkout scm
                             sh 'make -f docker.Makefile save-invocation-image'
-                        }
-                        dir('/tmp') {
                             stash name: 'invocation-image', includes: 'invocation-image-*.tar'
                             archiveArtifacts 'invocation-image-*.tar'
-                        }                        
-                        dir('src/github.com/docker/app') {
-                            sh 'make -f docker.Makefile clean-invocation-image'
                         }
                     }
                     post {
@@ -97,15 +92,13 @@ pipeline {
                     agent {
                         label 'team-local && linux'
                     }
-            environment {
-                DOCKERAPP_BINARY = '../docker-app-linux'
-            }
+                    environment {
+                        DOCKERAPP_BINARY = '../docker-app-linux'
+                    }
                     steps  {
-                        dir('/tmp') {
-                            unstash "invocation-image"
-                        }
                         dir('src/github.com/docker/app') {
                             checkout scm
+                            unstash "invocation-image"
                             sh 'make -f docker.Makefile load-invocation-image'
                             unstash "binaries"
                             dir('examples') {
@@ -127,15 +120,13 @@ pipeline {
                     agent {
                         label 'team-local && mac'
                     }
-            environment {
-                DOCKERAPP_BINARY = '../docker-app-darwin'
-            }
+                    environment {
+                        DOCKERAPP_BINARY = '../docker-app-darwin'
+                    }
                     steps {
-                        dir('/tmp') {
-                            unstash "invocation-image"
-                        }
                         dir('src/github.com/docker/app') {
                             checkout scm
+                            unstash "invocation-image"
                             sh 'make -f docker.Makefile load-invocation-image'
                             unstash "binaries"
                             dir('examples') {
@@ -157,15 +148,13 @@ pipeline {
                     agent {
                         label 'team-local && windows && linux-containers'
                     }
-            environment {
-                DOCKERAPP_BINARY = '../docker-app-windows.exe'
-            }
+                    environment {
+                        DOCKERAPP_BINARY = '../docker-app-windows.exe'
+                    }
                     steps {
-                        dir('/tmp') {
-                            unstash "invocation-image"
-                        }
                         dir('src/github.com/docker/app') {
                             checkout scm
+                            unstash "invocation-image"
                             bat 'make -f docker.Makefile load-invocation-image'
                             unstash "binaries"
                             dir('examples') {
@@ -199,11 +188,9 @@ pipeline {
                     }
                     steps{
                         sh 'docker login --username "${DOCKERHUB_CREDS_USR}" --password "${DOCKERHUB_CREDS_PSW}"'
-                        dir('/tmp') {
-                            unstash "invocation-image"
-                        }
                         dir('src/github.com/docker/app') {
-                            checkout scm                            
+                            checkout scm
+                            unstash "invocation-image"
                             sh 'make -f docker.Makefile load-invocation-image'
                             sh 'make -f docker.Makefile push-invocation-image'
                         }            

diff --git a/docker.Makefile b/docker.Makefile
@@ -13,19 +13,12 @@ E2E_CROSS_CTNR_NAME := $(BIN_NAME)-e2e-cross-$(TAG)
 COV_CTNR_NAME := $(BIN_NAME)-cov-$(TAG)
 SCHEMAS_CTNR_NAME := $(BIN_NAME)-schemas-$(TAG)
 
-
 BUILD_ARGS=--build-arg=EXPERIMENTAL=$(EXPERIMENTAL) --build-arg=TAG=$(TAG) --build-arg=COMMIT=$(COMMIT)
 
 PKG_PATH := /go/src/$(PKG_NAME)
 
 CNAB_BASE_INVOCATION_IMAGE_NAME := docker/cnab-app-base:$(TAG)
-
-CNAB_BASE_INVOCATION_IMAGE_PATH := /tmp/invocation-image-$(TAG).tar
-RM := rm
-ifeq ($(OS),Windows_NT)
-  CNAB_BASE_INVOCATION_IMAGE_PATH := c:\tmp\invocation-image-$(TAG).tar
-  RM := del
-endif
+CNAB_BASE_INVOCATION_IMAGE_PATH := invocation-image-$(TAG).tar
 
 .DEFAULT: all
 all: cross test
@@ -113,10 +106,6 @@ save-invocation-image: invocation-image
 
 load-invocation-image:
 	docker load -i $(CNAB_BASE_INVOCATION_IMAGE_PATH)
-	$(RM) $(CNAB_BASE_INVOCATION_IMAGE_PATH)
-
-clean-invocation-image:
-	$(RM) $(CNAB_BASE_INVOCATION_IMAGE_PATH)
 
 push-invocation-image:
 	docker push $(CNAB_BASE_INVOCATION_IMAGE_NAME)