From b56a8b2120cc330ae10a85b7f0c8c5de1aa9c7b0 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Date: Wed, 20 Dec 2017 16:22:19 +0900
Subject: [PATCH] travis: use the default version of Docker Engine (17.09)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
---
 .travis.yml          |  6 ------
 hack/lint            |  8 +++++---
 hack/test            | 15 ++++++++++-----
 hack/update-vendor   | 10 ++++++----
 hack/validate-vendor |  8 +++++---
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6107b260..404c6969 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,4 @@
 dist: trusty
 sudo: required
-
-install:
-  - sudo apt-get -qq remove docker-engine
-# requires Docker >= 17.05 for multistage Dockerfile
-  - curl -fsSL https://get.docker.com/ | sh
-
 script:
   - make binaries-all validate-all
diff --git a/hack/lint b/hack/lint
index fefbbecd..a01ebce3 100755
--- a/hack/lint
+++ b/hack/lint
@@ -2,6 +2,8 @@
 
 set -eu -o pipefail -x
 
-# update this to iidfile after 17.06
-docker build -t buildkit:lint -f ./hack/dockerfiles/lint.Dockerfile --force-rm .
-docker run buildkit:lint gometalinter --config=gometalinter.json ./...
+iidfile=$(mktemp --tmpdir docker-iidfile.XXXXXXXXXX)
+docker build --iidfile $iidfile -f ./hack/dockerfiles/lint.Dockerfile --force-rm .
+iid=$(cat $iidfile)
+docker run $iid gometalinter --config=gometalinter.json ./...
+rm -f $iidfile
diff --git a/hack/test b/hack/test
index c5968662..3ca21201 100755
--- a/hack/test
+++ b/hack/test
@@ -2,10 +2,15 @@
 
 set -eu -o pipefail -x
 
-# update this to iidfile after 17.06
-docker build -t buildkit:test --target integration-tests -f ./hack/dockerfiles/test.Dockerfile --force-rm .
+iidfile=$(mktemp --tmpdir docker-iidfile.XXXXXXXXXX)
 
-docker run --rm -v /tmp --privileged buildkit:test go test -tags no_containerd_worker ${TESTFLAGS:--v} ${TESTPKGS:-./...}
+docker build --iidfile $iidfile --target integration-tests -f ./hack/dockerfiles/test.Dockerfile --force-rm .
 
-docker run --rm buildkit:test go build ./frontend/gateway/client
-docker run --rm buildkit:test go build ./frontend/dockerfile/cmd/dockerfile-frontend
+iid=$(cat $iidfile)
+
+docker run --rm -v /tmp --privileged $iid go test -tags no_containerd_worker ${TESTFLAGS:--v} ${TESTPKGS:-./...}
+
+docker run --rm $iid go build ./frontend/gateway/client
+docker run --rm $iid go build ./frontend/dockerfile/cmd/dockerfile-frontend
+
+rm -f $iidfile
diff --git a/hack/update-vendor b/hack/update-vendor
index be9e7811..3e5eadac 100755
--- a/hack/update-vendor
+++ b/hack/update-vendor
@@ -2,9 +2,11 @@
 
 set -eu -o pipefail -x
 
-# update this to iidfile after 17.06
-docker build --build-arg VNDR_VERSION=48ac2669d9d1bcacd3163650ef911edca2ec3b42 -t buildkit:vendor -f ./hack/dockerfiles/vendor.Dockerfile --force-rm .
-cid=$(docker create buildkit:vendor noop)
+iidfile=$(mktemp --tmpdir docker-iidfile.XXXXXXXXXX)
+docker build --build-arg VNDR_VERSION=48ac2669d9d1bcacd3163650ef911edca2ec3b42 --iidfile $iidfile -f ./hack/dockerfiles/vendor.Dockerfile --force-rm .
+iid=$(cat $iidfile)
+cid=$(docker create $iid noop)
 rm -rf ./vendor
 docker cp $cid:/go/src/github.com/moby/buildkit/vendor .
-docker rm $cid
\ No newline at end of file
+docker rm $cid
+rm -f $iidfile
diff --git a/hack/validate-vendor b/hack/validate-vendor
index 2adeab25..1367d449 100755
--- a/hack/validate-vendor
+++ b/hack/validate-vendor
@@ -2,9 +2,10 @@
 
 set -eu -o pipefail -x
 
-# update this to iidfile after 17.06
-docker build --build-arg VNDR_VERSION=48ac2669d9d1bcacd3163650ef911edca2ec3b42 -t buildkit:vendor -f ./hack/dockerfiles/vendor.Dockerfile --force-rm .
-diffs="$(docker run buildkit:vendor git status --porcelain -- vendor 2>/dev/null)"
+iidfile=$(mktemp --tmpdir docker-iidfile.XXXXXXXXXX)
+docker build --build-arg VNDR_VERSION=48ac2669d9d1bcacd3163650ef911edca2ec3b42 --iidfile $iidfile -f ./hack/dockerfiles/vendor.Dockerfile --force-rm .
+iid=$(cat $iidfile)
+diffs="$(docker run $iid git status --porcelain -- vendor 2>/dev/null)"
 if [ "$diffs" ]; then
     {
         set +x
@@ -18,3 +19,4 @@ if [ "$diffs" ]; then
     false
 fi
 echo 'Congratulations! All vendoring changes are done the right way.'
+rm -f $iidfile