From 7974dc8c4ef2967e3b13e74c6dc927c18372bb34 Mon Sep 17 00:00:00 2001
From: Oleksandr Shulgin <oleksandr.shulgin@zalando.de>
Date: Wed, 1 Feb 2017 11:06:43 +0100
Subject: [PATCH] Move Dockerfile to a subdir for smaller build context

---
 .gitignore                      |  2 ++
 Makefile                        | 10 +++++++---
 Dockerfile => docker/Dockerfile |  4 +---
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename Dockerfile => docker/Dockerfile (57%)

diff --git a/.gitignore b/.gitignore
index 379ad2fbc..00d6ceb31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ _testmain.go
 *.prof
 /vendor/
 /.glide/
+/build/
+/docker/build/
diff --git a/Makefile b/Makefile
index 694fdbcc8..ab31e4562 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 BINARY ?= postgres-operator
 BUILD_FLAGS ?= -i
-DOCKERFILE = Dockerfile
+DOCKERFILE = docker/Dockerfile
 IMAGE ?= pierone.example.com/acid/$(BINARY)
 TAG ?= $(VERSION)
 GITHEAD = $(shell git rev-parse --short HEAD)
@@ -30,8 +30,12 @@ build/linux/${BINARY}: ${SOURCES}
 build/macos/${BINARY}: ${SOURCES}
 	GOOS=darwin GOARCH=amd64 go build -o $@ ${BUILD_FLAGS} $^
 
-docker: ${DOCKERFILE} scm-source.json linux
-	docker build --rm -t "$(IMAGE):$(TAG)" -f $< .
+docker-context: scm-source.json linux
+	mkdir -p docker/build/
+	cp build/linux/${BINARY} scm-source.json docker/build/
+
+docker: ${DOCKERFILE} docker-context
+	cd docker && docker build --rm -t "$(IMAGE):$(TAG)" .
 
 push:
 	docker push "$(IMAGE):$(TAG)"
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 57%
rename from Dockerfile
rename to docker/Dockerfile
index 905075eef..64a488163 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,6 @@
 FROM alpine
 MAINTAINER Team ACID @ Zalando <team-acid@zalando.de>
 
-ADD build/linux/postgres-operator /postgres-operator
-ADD scm-source.json /
+COPY build/* /
 
 ENTRYPOINT ["/postres-operator"]
-