From 4febb84b7dd7579c29d2a309f42b8b3d1dcbdc8d Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Thu, 25 Oct 2018 20:37:29 +0200 Subject: [PATCH] build: fix docker-test target --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 86266fcc6..0ccfd2628 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -107,20 +106,12 @@ docker-aliases: # cache the binaries and prevent repeated downloads since # ADD 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: