From 8a0cdc7e65597c2405600402110ec6cfd61c3370 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Fri, 28 Sep 2018 11:31:57 +0200
Subject: [PATCH] Updated dockerfiles to fit dockerhub autmated build proc

---
 docker/Dockerfile => Dockerfile.auth |  9 ++-------
 Dockerfile.crm                       | 26 ++++++++++++++++++++++++++
 Dockerfile.sam                       | 26 ++++++++++++++++++++++++++
 Makefile                             |  4 ++--
 4 files changed, 56 insertions(+), 9 deletions(-)
 rename docker/Dockerfile => Dockerfile.auth (75%)
 create mode 100644 Dockerfile.crm
 create mode 100644 Dockerfile.sam

diff --git a/docker/Dockerfile b/Dockerfile.auth
similarity index 75%
rename from docker/Dockerfile
rename to Dockerfile.auth
index 77edf0ad7..b8b2349df 100644
--- a/docker/Dockerfile
+++ b/Dockerfile.auth
@@ -4,13 +4,11 @@ FROM golang:1.10-alpine AS builder
 
 WORKDIR /go/src/github.com/crusttech/crust
 
-ARG APP
-ENV APP=$APP
 ENV CGO_ENABLED=0
 
 COPY . .
 
-RUN mkdir /build; go build -o /build/$APP cmd/$APP/*.go
+RUN mkdir /build; go build -o /build/auth cmd/auth/*.go
 
 
 ## target image
@@ -25,7 +23,4 @@ WORKDIR /crust
 COPY --from=builder /build/* /crust/
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
-ARG APP
-ENV APP=$APP
-
-ENTRYPOINT /crust/$APP
+ENTRYPOINT /crust/auth
diff --git a/Dockerfile.crm b/Dockerfile.crm
new file mode 100644
index 000000000..14fd3014f
--- /dev/null
+++ b/Dockerfile.crm
@@ -0,0 +1,26 @@
+## builder image
+
+FROM golang:1.10-alpine AS builder
+
+WORKDIR /go/src/github.com/crusttech/crust
+
+ENV CGO_ENABLED=0
+
+COPY . .
+
+RUN mkdir /build; go build -o /build/crm cmd/crm/*.go
+
+
+## target image
+
+FROM alpine:3.7
+
+ENV PATH="/crust:{$PATH}"
+WORKDIR /crust
+
+# @todo copy crm/types, migrations
+
+COPY --from=builder /build/* /crust/
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+ENTRYPOINT /crust/crm
diff --git a/Dockerfile.sam b/Dockerfile.sam
new file mode 100644
index 000000000..b1b3d4951
--- /dev/null
+++ b/Dockerfile.sam
@@ -0,0 +1,26 @@
+## builder image
+
+FROM golang:1.10-alpine AS builder
+
+WORKDIR /go/src/github.com/crusttech/crust
+
+ENV CGO_ENABLED=0
+
+COPY . .
+
+RUN mkdir /build; go build -o /build/sam cmd/sam/*.go
+
+
+## target image
+
+FROM alpine:3.7
+
+ENV PATH="/crust:{$PATH}"
+WORKDIR /crust
+
+# @todo copy crm/types, migrations
+
+COPY --from=builder /build/* /crust/
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+ENTRYPOINT /crust/sam
diff --git a/Makefile b/Makefile
index 3906ef5f9..86fadf41f 100644
--- a/Makefile
+++ b/Makefile
@@ -38,12 +38,12 @@ nothing:
 docker: $(IMAGES:%=docker-image.%)
 
 docker-image.%: %
-	@ docker build --no-cache --rm --build-arg APP=$^  -f docker/Dockerfile -t crusttech/$^ .
+	@ docker build --no-cache --rm -f docker/$^/Dockerfile -t crusttech/crust:latest-$^ .
 
 docker-push: $(IMAGES:%=docker-push.%)
 
 docker-push.%: %
-	@ docker push crusttech/$^
+	@ docker push crusttech/crust:latest-$^
 
 
 ########################################################################################################################