Merge pull request #211 from vdemeester/vendor-check

Add a vendor check

Author: Vincent Demeester

.dockerignore

@@ -1,4 +1,3 @@
-.git
 *.dockerapp
 *.tar.gz
 _build/

Dockerfile

@@ -18,6 +18,9 @@ RUN curl -Ls https://download.docker.com/linux/static/$DOCKERCLI_CHANNEL/x86_64/
 WORKDIR /go/src/github.com/docker/app/
 
 FROM build AS dev
+ARG DEP_VERSION=v0.4.1
+RUN curl -o /usr/bin/dep -L https://github.com/golang/dep/releases/download/${DEP_VERSION}/dep-linux-amd64 && \
+    chmod +x /usr/bin/dep
 COPY . .
 
 FROM dev AS docker-app

Jenkinsfile

@@ -11,37 +11,51 @@ pipeline {
 
     stages {
         stage('Build') {
-            agent {
-                label 'linux'
-            }
-            steps  {
-                dir('src/github.com/docker/app') {
-                    script {
-                        try {
+            parallel {
+                stage("Validate") {
+                    agent {
+                        label 'linux'
+                    }
+                    steps {
+                        dir('src/github.com/docker/app') {
                             checkout scm
-                            sh 'docker image prune -f'
                             sh 'make -f docker.Makefile lint'
-                            sh 'make -f docker.Makefile cross e2e-cross tars'
-                            dir('bin') {
-                                stash name: 'binaries'
-                            }
-                            dir('e2e') {
-                                stash name: 'e2e'
-                            }
-                            if(!(env.BRANCH_NAME ==~ "PR-\\d+")) {
-                                stash name: 'artifacts', includes: 'bin/*.tar.gz', excludes: 'bin/*-e2e-*'
-                                archiveArtifacts 'bin/*.tar.gz'
-                            }
-                        } finally {
-                            def clean_images = /docker image ls --format "{{.ID}}\t{{.Tag}}" | grep $(git describe --always --dirty) | awk '{print $1}' | xargs docker image rm -f/
-                            sh clean_images
+                            sh 'make -f docker.Makefile vendor'
                         }
                     }
                 }
-            }
-            post {
-                always {
-                    deleteDir()
+                stage("Binaries"){
+                    agent {
+                        label 'linux'
+                    }
+                    steps  {
+                        dir('src/github.com/docker/app') {
+                            script {
+                                try {
+                                    checkout scm
+                                    sh 'make -f docker.Makefile cross e2e-cross tars'
+                                    dir('bin') {
+                                        stash name: 'binaries'
+                                    }
+                                    dir('e2e') {
+                                        stash name: 'e2e'
+                                    }
+                                    if(!(env.BRANCH_NAME ==~ "PR-\\d+")) {
+                                        stash name: 'artifacts', includes: 'bin/*.tar.gz', excludes: 'bin/*-e2e-*'
+                                        archiveArtifacts 'bin/*.tar.gz'
+                                    }
+                                } finally {
+                                    def clean_images = /docker image ls --format "{{.ID}}\t{{.Tag}}" | grep $(git describe --always --dirty) | awk '{print $1}' | xargs docker image rm -f/
+                                    sh clean_images
+                                }
+                            }
+                        }
+                    }
+                    post {
+                        always {
+                            deleteDir()
+                        }
+                    }
                 }
             }
         }

Makefile

@@ -68,5 +68,9 @@ clean:
 	$(call rm,_build)
 	$(call rm,docker-app-*.tar.gz)
 
-.PHONY: cross e2e-cross test check lint test-unit test-e2e coverage coverage-bin coverage-test-unit coverage-test-e2e clean
+vendor:
+	$(call rm,vendor)
+	dep ensure -v
+
+.PHONY: cross e2e-cross test check lint test-unit test-e2e coverage coverage-bin coverage-test-unit coverage-test-e2e clean vendor
 .DEFAULT: all

docker.Makefile

@@ -82,8 +82,12 @@ gradle-test:
 	docker run --rm $(GRADLE_IMAGE_NAME) bash -c "./gradlew --stacktrace build && cd example && gradle renderIt"
 
 lint:
-	@echo "Linting..."
+	$(info Linting...)
 	docker build -t $(LINT_IMAGE_NAME) $(IMAGE_BUILD_ARGS) -f Dockerfile.lint .
 	docker run --rm $(LINT_IMAGE_NAME) make lint
 
-.PHONY: lint test-e2e test-unit test cross e2e-cross coverage gradle-test shell build_dev_image tars
+vendor: build_dev_image
+	$(info Vendoring...)
+	docker run --rm $(DEV_IMAGE_NAME) sh -c "make BUILDTIME=${BUILDTIME} vendor && hack/check-git-diff vendor"
+
+.PHONY: lint test-e2e test-unit test cross e2e-cross coverage gradle-test shell build_dev_image tars vendor

hack/check-git-diff

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -eu
+
+DIFF_PATH=$1
+DIFF=$(git status --porcelain -- "$DIFF_PATH")
+
+if [ "$DIFF" ]; then
+    echo
+    echo "These files were changed:"
+    echo
+    echo "$DIFF"
+    echo
+    exit 1
+else
+    echo "$DIFF_PATH is correct"
+fi;