Permalink
Browse files

simplify

  • Loading branch information...
shivnagarajan committed Dec 6, 2016
1 parent 103e423 commit 520815113794e74124051a7f632d482576bd374f
Showing with 4 additions and 6 deletions.
  1. +2 −2 Dockerfile
  2. +1 −3 Makefile
  3. +1 −1 dev.yml
View
@@ -1,7 +1,7 @@
FROM alpine
-COPY tmp/toxiproxy /go/bin/toxiproxy
-COPY tmp/toxiproxy-cli /go/bin/toxiproxy-cli
+COPY tmp/build/toxiproxy-server-linux-amd64 /go/bin/toxiproxy
+COPY tmp/build/toxiproxy-cli-linux-amd64 /go/bin/toxiproxy-cli
EXPOSE 8474
ENTRYPOINT ["/go/bin/toxiproxy"]
View
@@ -69,9 +69,7 @@ $(DEB): tmp/build/$(SERVER_NAME)-linux-amd64 tmp/build/$(CLI_NAME)-linux-amd64
docker:
docker build --tag="shopify/toxiproxy:git" .
-docker-release:
- mkdir -p tmp
- docker run -it --rm -v `pwd`/tmp:/go/bin -v `pwd`:/go/src/github.com/Shopify/toxiproxy golang:1.7 sh -c 'go build -ldflags="-X github.com/Shopify/toxiproxy.Version=$(cat /go/src/github.com/Shopify/toxiproxy/VERSION)" -o /go/bin/toxiproxy github.com/Shopify/toxiproxy/cmd && go build -o /go/bin/toxiproxy-cli github.com/Shopify/toxiproxy/cli'
+docker-release: linux
docker build --rm=true --tag="shopify/toxiproxy:$(VERSION)" .
docker tag shopify/toxiproxy:$(VERSION) shopify/toxiproxy:latest
docker push shopify/toxiproxy:$(VERSION)
View
@@ -1,7 +1,7 @@
name: toxiproxy
up:
- - go: 1.6.2
+ - go: 1.7.3
commands:
build:

0 comments on commit 5208151

Please sign in to comment.