Drop multi-stage Dockerfile (for now)

Drop multi-stage Dockerfile for now (not widely supported yet), and simplify the regular single-stage Dockerfile and build process.
JuanPabloSGU · Jun 5, 2017 · 935fb3f · 935fb3f
1 parent 17c0e5d
commit 935fb3f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@
 /controller.image
 /*-static
 /controller.yaml
+/docker/controller
diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -19,11 +19,11 @@ controller: $(GO_FILES)
 ksonnet-seal: $(GO_FILES)
 	$(GO) build -o $@ $(GO_FLAGS) ./cmd/ksonnet-seal
 
-%-static: $(GO_FILES)
-	CGO_ENABLED=0 $(GO) build -o $@ -installsuffix cgo $(GO_FLAGS) ./cmd/$*
+docker/controller: $(GO_FILES)
+	CGO_ENABLED=0 $(GO) build -o $@ -installsuffix cgo $(GO_FLAGS) ./cmd/controller
 
-controller.image: Dockerfile.single controller-static
-	$(DOCKER) build -f Dockerfile.single -t $(CONTROLLER_IMAGE) .
+controller.image: docker/Dockerfile docker/controller
+	$(DOCKER) build -t $(CONTROLLER_IMAGE) docker/
 	#$(DOCKER) image inspect $(CONTROLLER_IMAGE) -f '$(shell echo $(CONTROLLER_IMAGE) | cut -d: -f1)@{{.Id}}' > $@.tmp
 	echo $(CONTROLLER_IMAGE) >$@.tmp
 	mv $@.tmp $@

diff --git a/Dockerfile.single → docker/Dockerfile b/Dockerfile.single → docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine
 MAINTAINER Angus Lees <gus@inodes.org>
-COPY controller-static /usr/local/bin/controller
+COPY controller /usr/local/bin/
 
 CMD ["controller", "--logtostderr"]