Skip to content

Commit

Permalink
build: fix docker-test target
Browse files Browse the repository at this point in the history
  • Loading branch information
magiconair committed Oct 25, 2018
1 parent af8ca29 commit 4febb84
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions Makefile
Expand Up @@ -23,7 +23,6 @@ GORELEASER = $(shell which goreleaser)
# pin versions for CI builds
CI_CONSUL_VERSION=1.3.0
CI_VAULT_VERSION=0.11.4
CI_GO_VERSION=1.11.1

# all is the default target
all: test
Expand Down Expand Up @@ -107,20 +106,12 @@ docker-aliases:
# cache the binaries and prevent repeated downloads since
# ADD <url> downloads the file every time.
docker-test:
test -r consul_$(CI_CONSUL_VERSION)_linux_amd64.zip || \
wget https://releases.hashicorp.com/consul/$(CI_CONSUL_VERSION)/consul_$(CI_CONSUL_VERSION)_linux_amd64.zip
test -r vault_$(CI_VAULT_VERSION)_linux_amd64.zip || \
wget https://releases.hashicorp.com/vault/$(CI_VAULT_VERSION)/vault_$(CI_VAULT_VERSION)_linux_amd64.zip
test -r go$(CI_GO_VERSION).linux-amd64.tar.gz || \
wget https://dl.google.com/go/go$(CI_GO_VERSION).linux-amd64.tar.gz
docker build \
--build-arg consul_version=$(CI_CONSUL_VERSION) \
--build-arg vault_version=$(CI_VAULT_VERSION) \
--build-arg go_version=$(CI_GO_VERSION) \
-t test-fabio \
-f Dockerfile-test \
-f Dockerfile \
.
docker run -it test-fabio make test

# codeship runs the CI on codeship
codeship:
Expand Down

0 comments on commit 4febb84

Please sign in to comment.