From 0d332b2f0575f4c942d3aaf7571ebfc1d512a30d Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Fri, 9 Aug 2019 18:05:17 -0700
Subject: [PATCH] Fix multi-stage builds

---
 Dockerfile.multi-stage | 13 ++++++++-----
 Makefile               |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.multi-stage b/Dockerfile.multi-stage
index 744e159..bf266f2 100644
--- a/Dockerfile.multi-stage
+++ b/Dockerfile.multi-stage
@@ -1,16 +1,19 @@
 ARG REPO=library
-FROM ${REPO}/golang:1.11-alpine AS builder
+FROM ${REPO}/golang:1.12-alpine AS builder
 
-COPY ./go.mod ./go.sum /go/src/app/
+RUN apk add --no-cache git
 
+RUN mkdir /app
+WORKDIR /app
+
+COPY ./go.mod ./go.sum /app/
 RUN go mod download
 
-COPY ./main.go /go/src/app/
-
+COPY ./main.go /app/
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -a -installsuffix nocgo -o dockron .
 
 FROM ${REPO}/busybox:latest
 WORKDIR /root/
-COPY --from=builder /go/src/app/dockron .
+COPY --from=builder /app/dockron .
 
 CMD [ "./dockron" ]
diff --git a/Makefile b/Makefile
index 67560a4..29cc505 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,8 @@ build-all-static: dockron-linux-amd64 dockron-linux-arm dockron-linux-arm64
 # Cleans all build artifacts
 .PHONY: clean
 clean:
-	rm dockron
-	rm dockron-linux-*
+	rm -f dockron
+	rm -f dockron-linux-*
 
 # Cleans vendor directory
 .PHONY: clean-vendor