update builder to go1.8 (#1301)

* update builder to go1.8

Closes #1292
This commit is contained in:
Victor Vrantchan 2017-02-24 20:04:45 -05:00 committed by GitHub
parent 897cb35e24
commit d18c0aa146
3 changed files with 5 additions and 5 deletions

View file

@ -24,13 +24,13 @@ dependencies:
- "/opt/google-cloud-sdk"
override:
- docker run -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8-yarn --deps
- docker run -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --deps
test:
override:
- docker run -d --name redis redis
- docker run -d --name mysql -e MYSQL_ROOT_PASSWORD=toor -e MYSQL_DATABASE=kolide -e MYSQL_USER=kolide -e MYSQL_PASSWORD=kolide mysql:5.7
- docker run --link redis:redis --link mysql:mysql -e MYSQL_TEST=true -e REDIS_TEST=true -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8-yarn --build
- docker run --link redis:redis --link mysql:mysql -e MYSQL_TEST=true -e REDIS_TEST=true -v $(pwd):/go/src/github.com/kolide/kolide -v /home/ubuntu/.go_workspace/pkg:/go/pkg kolide/kolide-builder:1.8 --build
- ./tools/ci/verify-dependencies-docs.sh
- docker stop $(docker ps -a -q)

View file

@ -9,10 +9,10 @@ build: kolide-builder
kolide-builder:
# copy node-sass artifacts into rootfs
cd $(GO_VERSION) && \
docker build -t kolide/kolide-builder:$(GO_VERSION)-yarn .
docker build -t kolide/kolide-builder:$(GO_VERSION) .
push:
docker push kolide/kolide-builder:$(GO_VERSION)-yarn
docker push kolide/kolide-builder:$(GO_VERSION)
clean:
rm -rf build

View file

@ -27,7 +27,7 @@ curl_binary() {
fi
}
docker_pull "kolide_builder" "kolide/kolide-builder:1.8-yarn"
docker_pull "kolide_builder" "kolide/kolide-builder:1.8"
docker_pull "redis" "redis"
docker_pull "mysql" "mysql:5.7"
docker_pull "fpm" "kolide/fpm"