Merge pull request #234 from AkihiroSuda/use-travis-default-docker

travis: use the default version of Docker Engine (17.09)

.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

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

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

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
+rm -f $iidfile

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