From 566e2131d15dda3a8b45d1dc1488b46c3d278917 Mon Sep 17 00:00:00 2001 From: Michael Kuzmin Date: Sun, 30 Jul 2017 03:56:10 +0300 Subject: [PATCH] Update build scripts --- build.sh | 5 ++++- docker-compose.yml | 2 +- docker/Dockerfile | 5 ----- test.sh | 4 ++++ 4 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 docker/Dockerfile create mode 100755 test.sh diff --git a/build.sh b/build.sh index 8930f4dfb..10e213284 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,12 @@ -#!/bin/sh -eux +#!/bin/sh + +set -eux glide install -v export CGO_ENABLED=0 export GOARCH=amd64 mkdir -p bin +rm bin/* GOOS=darwin go build -o bin/packer-builder-vsphere.macos GOOS=linux go build -o bin/packer-builder-vsphere.linux diff --git a/docker-compose.yml b/docker-compose.yml index 42740643f..5d2c26933 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ build: - build: docker/ + image: jetbrainsinfra/golang:1.8.3 volumes: - .:/go/src/github.com/jetbrains-infra/packer-builder-vsphere working_dir: /go/src/github.com/jetbrains-infra/packer-builder-vsphere diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 64c776491..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM golang:1.8.3 -ARG GLIDE_VERSION=0.12.3 - -RUN wget -nv https://github.com/Masterminds/glide/releases/download/v$GLIDE_VERSION/glide-v$GLIDE_VERSION-linux-amd64.tar.gz -O- | \ -tar xzf - -C /usr/local/bin/ --strip-components=1 linux-amd64/glide diff --git a/test.sh b/test.sh new file mode 100755 index 000000000..0c7683736 --- /dev/null +++ b/test.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +export PACKER_ACC=1 +go test -v