fix(build): docker file cleanups

.drone.yml

@@ -55,16 +55,16 @@ steps:
       from_secret: docker_hub_password
 
 
-#- name: mono
-#  image: plugins/docker
-#  settings:
-#    repo: crusttech/crust
-#    auto_tag: true # generate tag names automatically based on git branch and git tag
-#    dockerfile: Dockerfile.crust
-#    username:
-#      from_secret: docker_hub_username
-#    password:
-#      from_secret: docker_hub_password
+- name: crust
+  image: plugins/docker
+  settings:
+    repo: crusttech/crust
+    auto_tag: true # generate tag names automatically based on git branch and git tag
+    dockerfile: Dockerfile.api
+    username:
+      from_secret: docker_hub_username
+    password:
+      from_secret: docker_hub_password
 
 trigger:
   branch:

Dockerfile.api-crm

@@ -3,8 +3,6 @@ FROM crusttech/crust-builder AS builder
 
 WORKDIR /go/src/github.com/crusttech/crust
 
-ENV CGO_ENABLED=0
-
 COPY . .
 
 RUN mkdir /build; \
@@ -12,13 +10,16 @@ RUN mkdir /build; \
         -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
         -o /build/crm cmd/crm/*.go
 
-## target image
+
+## == target image ==
+
 FROM alpine:3.7
 
-WORKDIR /crust
+RUN apk add --no-cache ca-certificates
 
-COPY --from=builder /build/* /crust/
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+COPY --from=builder /build /crust
+
+WORKDIR /crust
 
 EXPOSE 80
 

Dockerfile.api-messaging

@@ -3,23 +3,23 @@ FROM crusttech/crust-builder AS builder
 
 WORKDIR /go/src/github.com/crusttech/crust
 
-ENV CGO_ENABLED=0
-
 COPY . .
 
-RUN apk update && apk upgrade && apk add --no-cache git
 RUN mkdir /build; \
     go build \
         -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
         -o /build/messaging cmd/messaging/*.go
 
-## target image
+
+## == target image ==
+
 FROM alpine:3.7
 
-WORKDIR /crust
+RUN apk add --no-cache ca-certificates
 
-COPY --from=builder /build/* /crust/
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+COPY --from=builder /build /crust
+
+WORKDIR /crust
 
 EXPOSE 80
 

Dockerfile.api-system

@@ -3,8 +3,6 @@ FROM crusttech/crust-builder AS builder
 
 WORKDIR /go/src/github.com/crusttech/crust
 
-ENV CGO_ENABLED=0
-
 COPY . .
 
 RUN mkdir /build; \
@@ -15,13 +13,16 @@ RUN mkdir /build; \
         -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
         -o /build/cli cmd/system-cli/*.go
 
-## target image
+
+## == target image ==
+
 FROM alpine:3.7
 
-WORKDIR /crust
+RUN apk add --no-cache ca-certificates
 
-COPY --from=builder /build/* /crust/
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+COPY --from=builder /build /crust
+
+WORKDIR /crust
 
 EXPOSE 80
 

Dockerfile.crust

@@ -1,15 +1,19 @@
 ## == builder image ==
 
-FROM crust-builder AS builder
+FROM crusttech/crust-builder AS builder
 
 WORKDIR /go/src/github.com/crusttech/crust
 
 COPY . .
 
 RUN mkdir /build; \
-    CGO_ENABLED=0 go build \
+    go build \
         -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
-        -o /build/crust cmd/crust/*.go
+        -o /build/crust cmd/crust/*.go && \
+    go build \
+        -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
+        -o /build/cli cmd/system-cli/*.go
+
 
 ## == webapp image ==
 
@@ -26,8 +30,8 @@ RUN apk add --no-cache ca-certificates
 COPY --from=builder /build /crust
 COPY --from=webapp /crust/webapp /crust/webapp
 
-EXPOSE 80
-
 WORKDIR /crust
 
+EXPOSE 80
+
 ENTRYPOINT /crust/crust

Dockerfile.crust-builder

@@ -1,5 +1,7 @@
 FROM golang:1.12-alpine
 
+ENV CGO_ENABLED=0
+
 RUN	apk add --no-cache git make bash && \
 	echo "installing gomock" && go get -u github.com/golang/mock/gomock && \
 	echo "installing mockgen" && go get -u github.com/golang/mock/mockgen && \