JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
docker-18.09
Akihiro Suda 2017-12-20 16:22:19 +09:00
parent ab06b2682b
commit b56a8b2120
5 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -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

8
hack/lint
View File

@ -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

15
hack/test
View File

@ -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

10
hack/update-vendor
View File

@ -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
docker rm $cid
rm -f $iidfile

8
hack/validate-vendor
View File

@ -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