fix(cache): use godep to build binaries

Author: Matthew Fisher

.gitignore

@@ -31,6 +31,7 @@ builder/image/bin/get-app-config
 builder/image/bin/get-app-values
 builder/image/bin/publish-release-controller
 builder/image/bin/yaml2json-procfile
+cache/image/bin
 client/dist/
 client/makeself/
 contrib/bumpver/bumpver

cache/Dockerfile

@@ -1,11 +1,14 @@
 FROM ubuntu-debootstrap:14.04
 
-ADD . /app
-
-EXPOSE 6379
-
-WORKDIR /app
-CMD ["/app/bin/boot"]
-
-ENV DEIS_RELEASE 1.4.0-dev
-
+# install deps
+RUN apt-get update && apt-get install -yq curl make gcc
+
+ENV REDIS 2.8.19
+ENV SHA 3e362f4770ac2fdbdce58a5aa951c1967e0facc8
+
+# install redis-server to /usr/local/bin
+RUN mkdir -p /usr/src/redis
+RUN curl -sSL http://download.redis.io/releases/redis-$REDIS.tar.gz | tar -xzC /usr/src/redis --strip-components=1 && \
+    cd /usr/src/redis && \
+    make && \
+    make install

cache/Makefile

@@ -3,18 +3,19 @@ include ../includes.mk
 COMPONENT = cache
 IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
 DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
-BUILD_IMAGE := $(COMPONENT)-build
+BUILD_IMAGE = $(COMPONENT)-build
+BINARY_DEST_DIR = image/bin
 
 build: check-docker
-	docker build -t $(BUILD_IMAGE) image
-	docker cp `docker run -d $(BUILD_IMAGE)`:/usr/local/bin/redis-server bin/
-	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/boot bin/
-	docker build -t $(IMAGE) .
-	rm bin/boot
-	rm bin/redis-server
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o $(BINARY_DEST_DIR)/boot main.go || exit 1
+	docker build -t $(BUILD_IMAGE) .
+	docker cp `docker run -d $(BUILD_IMAGE)`:/usr/local/bin/redis-server $(BINARY_DEST_DIR)/
+	docker build -t $(IMAGE) image
 
 clean: check-docker check-registry
-	docker rmi $(IMAGE)
+	rm -f $(BINARY_DEST_DIR)/boot
+	rm -f $(BINARY_DEST_DIR)/redis-server
+	docker rmi -f $(IMAGE)
 
 full-clean: check-docker check-registry
 	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f

cache/image/Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.3
+FROM ubuntu-debootstrap:14.04
 
-ADD . /go/src/github.com/deis/deis/boot
+ADD . /app
+WORKDIR /app
 
-RUN DOCKER_BUILD=true /go/src/github.com/deis/deis/boot/build.sh
+CMD ["/app/bin/boot"]
+EXPOSE 6379
 
-WORKDIR /go/src/github.com/deis/deis/boot
-
-RUN CGO_ENABLED=0 go get -a -ldflags '-s' github.com/deis/deis/boot
+ENV DEIS_RELEASE 1.4.0-dev