Merge pull request #2778 from aledbf/fix_router_godeps

ref(router): change structure to allow the update of go dependencies

Author: Matthew Fisher

.gitignore

@@ -43,7 +43,7 @@ docs/docs.zip
 logspout/build/
 logspout/Godeps/
 publisher/Godeps/
-router/parent/Godeps/
+router/Godeps/
 
 # coverage reports
 .coverage

router/Dockerfile

@@ -1,25 +1,19 @@
-FROM ubuntu-debootstrap:14.04
+FROM golang:1.3
 
-ENV DEBIAN_FRONTEND noninteractive
+ADD firewall /tmp/firewall
 
-# install common packages
-RUN apt-get update && apt-get install -y curl net-tools sudo
+ADD build.sh /go/src/github.com/deis/deis/router/build.sh
 
-# install confd
-RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-git-b8e693c \
-    && chmod +x /usr/local/bin/confd
+WORKDIR /go/src/github.com/deis/deis/router
 
-# install common packages
-RUN apt-get update && apt-get install -y libgeoip1
+RUN DOCKER_BUILD=true /go/src/github.com/deis/deis/router/build.sh
 
-WORKDIR /app
+RUN tar -C /opt/nginx -czf /nginx.tgz .
 
-EXPOSE 80 2222
+RUN go get github.com/tools/godep
 
-CMD ["/app/bin/boot"]
+ADD . /go/src/github.com/deis/deis/router/
 
-ADD . /app
+RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' boot.go
 
-ADD nginx.tgz /opt/nginx
-
-RUN rm nginx.tgz
+RUN cp /go/src/github.com/deis/deis/router/boot /go/bin/boot

router/Makefile

@@ -6,16 +6,16 @@ DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
 BUILD_IMAGE = $(COMPONENT)-build
 
 build: check-docker
-	cp -pR ../Godeps parent/
-	docker build -t $(BUILD_IMAGE) parent
-	docker cp `docker run -d $(BUILD_IMAGE)`:/nginx.tgz `pwd`
-	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/boot bin/
-	docker build -t $(IMAGE) .
-	rm nginx.tgz
-	rm bin/boot
+	cp -pR ../Godeps .
+	docker build -t $(BUILD_IMAGE) .
+	docker cp `docker run -d $(BUILD_IMAGE)`:/nginx.tgz image/
+	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/boot image/bin/
+	docker build -t $(IMAGE) image
+	rm image/nginx.tgz
+	rm image/bin/boot
 
 clean: check-docker check-registry
-	rm -rf parent/Godeps
+	rm -rf Godeps
 	docker rmi $(IMAGE)
 
 full-clean: check-docker check-registry