redesign Dockerfile and Makefile to follow sapcc/swift-drive-autopilot

Author: majewsky

Dockerfile

@@ -1,12 +1,18 @@
+FROM golang:1.8.3-alpine3.6 as builder
+WORKDIR /x/src/github.com/sapcc/swift-http-import/
+RUN apk add --no-cache curl make openssl && \
+    mkdir -p /pkg/bin/ && \
+    curl -L https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 > /pkg/bin/dumb-init && \
+    chmod +x /pkg/bin/dumb-init
+
+COPY . .
+RUN make install PREFIX=/pkg
+
+################################################################################
+
 FROM alpine:latest
 MAINTAINER "Stefan Majewsky <stefan.majewsky@sap.com>"
+RUN apk add --no-cache ca-certificates
 
-# wget(1) is only used to retrieve dumb-init
-RUN apk update && \
-    apk add wget ca-certificates && \
-    wget -O /bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 && \
-    chmod +x /bin/dumb-init && \
-    apk del wget
-
-ADD swift-http-import /bin/swift-http-import
-ENTRYPOINT ["/bin/dumb-init", "--", "/bin/swift-http-import"]
+COPY --from=builder /pkg/ /usr/
+ENTRYPOINT ["/usr/bin/dumb-init", "--", "/usr/bin/swift-http-import"]

Makefile

@@ -1,17 +1,26 @@
-all: swift-http-import
+PKG    = github.com/sapcc/swift-http-import
+PREFIX := /usr
+
+all: build/swift-http-import
 
 # force people to use golangvend
-GOCC := env GOPATH=$(CURDIR)/.gopath go
-GOFLAGS := -ldflags '-s -w'
+GO            := GOPATH=$(CURDIR)/.gopath GOBIN=$(CURDIR)/build go
+GO_BUILDFLAGS :=
+GO_LDFLAGS    := -s -w
 
-swift-http-import: *.go
-	$(GOCC) build $(GOFLAGS) -o $@ github.com/sapcc/swift-http-import
+build/swift-http-import: FORCE
+	$(GO) install $(GO_BUILDFLAGS) -ldflags '$(GO_LDFLAGS)' '$(PKG)'
 
 check: all
 	bash tests.sh http
 	bash tests.sh swift
 	echo -e '\e[1;32mSuccess!\e[0m'
 
+install: FORCE all
+	install -D -m 0755 build/swift-http-import "$(DESTDIR)$(PREFIX)/bin/swift-http-import"
+
 vendor:
+	@# vendoring by https://github.com/holocm/golangvend
 	@golangvend
-.PHONY: vendor
+
+.PHONY: FORCE

tests.sh

@@ -88,7 +88,7 @@ fi
 
 mirror() {
   # config file comes from stdin
-  ./swift-http-import /proc/self/fd/0
+  ./build/swift-http-import /proc/self/fd/0
   # wait for container listing to get updated
   sleep 15
 }