From 1552e7e9cfea843c864d67252271ea8c42126303 Mon Sep 17 00:00:00 2001
From: Cadey Dodrill <me@christine.website>
Date: Mon, 18 Apr 2016 10:20:56 -0700
Subject: [PATCH] fix these

---
 devops/consul/Dockerfile | 7 ++-----
 devops/nomad/Dockerfile  | 7 ++-----
 devops/serf/Dockerfile   | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/devops/consul/Dockerfile b/devops/consul/Dockerfile
index 327502f..800637d 100644
--- a/devops/consul/Dockerfile
+++ b/devops/consul/Dockerfile
@@ -2,19 +2,16 @@ FROM alpine:edge
 
 ENV CONSUL_VERSION v0.6.4
 
-ADD https://github.com/lalyos/docker-upx/releases/download/v3.91/upx /bin/upx
-
 RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
   apk update; apk upgrade && \
   apk add curl make git go gcc musl-dev openssl-dev && \
   mkdir /go && \
   export GOPATH=/go && \
-  go get -u -tags ${CONSUL_VERSION} -ldflags -s github.com/hashicorp/consul && \
+  go get -u -tags ${CONSUL_VERSION} github.com/hashicorp/consul && \
   echo "consul built" && \
-  chmod +x /bin/upx && for file in /go/bin/* ; do upx -6 $file ; done && \
   mv /go/bin/* /usr/local/bin && \
   rm -rf /go && \
-  apk del curl make git go gcc musl-dev openssl-dev && \
+  apk del make git go gcc musl-dev openssl-dev && \
   rm -rf /var/cache/apk/*
 
 CMD /usr/local/bin/consul
diff --git a/devops/nomad/Dockerfile b/devops/nomad/Dockerfile
index 5ab0018..48ad9f3 100644
--- a/devops/nomad/Dockerfile
+++ b/devops/nomad/Dockerfile
@@ -2,19 +2,16 @@ FROM alpine:edge
 
 ENV NOMAD_VERSION v0.3.1
 
-ADD https://github.com/lalyos/docker-upx/releases/download/v3.91/upx /bin/upx
-
 RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
   apk update; apk upgrade && \
   apk add curl make git go gcc musl-dev openssl-dev && \
   mkdir /go && \
   export GOPATH=/go && \
-  go get -u -tags ${NOMAD_VERSION} -ldflags -s github.com/hashicorp/nomad && \
+  go get -u -tags ${NOMAD_VERSION} github.com/hashicorp/nomad && \
   echo "nomad built" && \
-  chmod +x /bin/upx && for file in /go/bin/* ; do upx -6 $file ; done && \
   mv /go/bin/* /usr/local/bin && \
   rm -rf /go && \
-  apk del curl make git go gcc musl-dev openssl-dev && \
+  apk del make git go gcc musl-dev openssl-dev && \
   rm -rf /var/cache/apk/*
 
 CMD /usr/local/bin/nomad
diff --git a/devops/serf/Dockerfile b/devops/serf/Dockerfile
index 982a744..9dd4208 100644
--- a/devops/serf/Dockerfile
+++ b/devops/serf/Dockerfile
@@ -2,19 +2,16 @@ FROM alpine:edge
 
 ENV SERF_VERSION v0.7.0
 
-ADD https://github.com/lalyos/docker-upx/releases/download/v3.91/upx /bin/upx
-
 RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
   apk update; apk upgrade && \
   apk add curl make git go gcc musl-dev openssl-dev && \
   mkdir /go && \
   export GOPATH=/go && \
-  go get -u -tags ${SERF_VERSION} -ldflags -s github.com/hashicorp/serf && \
+  go get -u -tags ${SERF_VERSION} github.com/hashicorp/serf && \
   echo "serf built" && \
-  chmod +x /bin/upx && for file in /go/bin/* ; do upx -6 $file ; done && \
   mv /go/bin/* /usr/local/bin && \
   rm -rf /go && \
-  apk del curl make git go gcc musl-dev openssl-dev && \
+  apk del make git go gcc musl-dev openssl-dev && \
   rm -rf /var/cache/apk/*
 
 CMD /usr/local/bin/serf