Updated dockerfiles to fit dockerhub autmated build proc

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

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

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

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-$^
 
 
 ########################################################################################################################