diff --git a/Dockerfile-test b/Dockerfile-test deleted file mode 100644 index b9b04ca46..000000000 --- a/Dockerfile-test +++ /dev/null @@ -1,15 +0,0 @@ -FROM ubuntu -RUN apt-get update && apt-get -y install make git-core unzip -ARG consul_version=1.0.6 -ARG vault_version=0.9.6 -ARG go_version=1.10.3 -ADD https://releases.hashicorp.com/consul/${consul_version}/consul_${consul_version}_linux_amd64.zip /usr/local/bin -ADD https://releases.hashicorp.com/vault/${vault_version}/vault_${vault_version}_linux_amd64.zip /usr/local/bin -ADD https://dl.google.com/go/go${go_version}.linux-amd64.tar.gz /usr/local -RUN cd /usr/local/bin && unzip consul_${consul_version}_linux_amd64.zip -RUN cd /usr/local/bin && unzip vault_${vault_version}_linux_amd64.zip -RUN cd /usr/local && tar xf go${go_version}.linux-amd64.tar.gz -ENV PATH=/usr/local/go/bin:/root/go/bin:$PATH -WORKDIR /root/go/src/github.com/fabiolb/fabio -COPY . . -CMD "/bin/bash" diff --git a/Makefile b/Makefile index 08f2ae885..86266fcc6 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,9 @@ GOVERSION = $(shell go version | awk '{print $$3;}') GORELEASER = $(shell which goreleaser) # pin versions for CI builds -CI_CONSUL_VERSION=1.2.3 -CI_VAULT_VERSION=0.11.1 -CI_GO_VERSION=1.11 +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