From d18c0aa146f411dec0b11b581327ae096dad01d6 Mon Sep 17 00:00:00 2001 From: Victor Vrantchan Date: Fri, 24 Feb 2017 20:04:45 -0500 Subject: [PATCH] update builder to go1.8 (#1301) * update builder to go1.8 Closes #1292 --- circle.yml | 4 ++-- tools/ci/docker/kolide-builder/Makefile | 4 ++-- tools/ci/download-build-deps.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index 3be208a663..0a262cf862 100644 --- a/circle.yml +++ b/circle.yml @@ -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) diff --git a/tools/ci/docker/kolide-builder/Makefile b/tools/ci/docker/kolide-builder/Makefile index 75b8ee2ce6..dbb1353b8f 100644 --- a/tools/ci/docker/kolide-builder/Makefile +++ b/tools/ci/docker/kolide-builder/Makefile @@ -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 diff --git a/tools/ci/download-build-deps.sh b/tools/ci/download-build-deps.sh index 98663d8aae..401a698e01 100755 --- a/tools/ci/download-build-deps.sh +++ b/tools/ci/download-build-deps.sh @@ -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"