Refit Docker build to match our current demands

.travis.yml

@@ -21,6 +21,7 @@ script:
   - make blackbox-integration-test
   - make lint
   - make vet
+  - make docker
 
 after_success:
   - if [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then make release; fi

Dockerfile

@@ -1,11 +1,15 @@
-# This file is a template, and might need editing before it works on your project.
-FROM golang:1.8-alpine AS builder
-# We'll likely need to add SSL root certificates
-RUN apk --no-cache add ca-certificates
-# Missing part for compiling the application by it self because it requires a sock
+#
+# NB! This file is a template and might need editing before it works on your project!
+#
+FROM golang:1.8 AS builder
+WORKDIR /go/src/github.com/ivanilves/lstags
+COPY . ./
+RUN ln -nfs /bin/bash /bin/sh && make assemble
 FROM scratch
-# Since we started from scratch, we'll copy the SSL root certificates from the builder
+# Since we started from scratch, we'll copy following from the builder:
+# * SSL root certificates bundle
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY lstags /usr/local/bin/lstags
-ENTRYPOINT [ "/usr/local/bin/lstags" ]
+# * compiled lstags binary
+COPY --from=builder /go/src/github.com/ivanilves/lstags/lstags /lstags
+ENTRYPOINT [ "/lstags" ]
 CMD ["--help"]

Makefile

@@ -4,6 +4,8 @@ all: prepare dep test lint vet build
 
 offline: unit-test lint vet build
 
+assemble: prepare dep lint vet build
+
 prepare:
 	go get -u -v \
 		github.com/golang/dep/cmd/dep \
@@ -69,10 +71,10 @@ shell-test-push-local:
 	./lstags localhost:${REGISTRY_PORT}/qa/library/alpine
 	${MAKE} --no-print-directory stop-local-registry
 
-lint: ERRORS:=$(shell find . -name "*.go" ! -path "./vendor/*" | xargs -i golint {} | tr '`' '|')
+lint: ERRORS=$(shell find . -name "*.go" ! -path "./vendor/*" | xargs -i golint {} | tr '`' '|')
 lint: fail-on-errors
 
-vet: ERRORS:=$(shell find . -name "*.go" ! -path "./vendor/*" | xargs -i go tool vet {} | tr '`' '|')
+vet: ERRORS=$(shell find . -name "*.go" ! -path "./vendor/*" | xargs -i go tool vet {} | tr '`' '|')
 vet: fail-on-errors
 
 fail-on-errors:
@@ -121,6 +123,7 @@ deploy:
 	GITHUB_TOKEN=${GITHUB_TOKEN} ./scripts/github-create-release.sh ./dist/release
 	GITHUB_TOKEN=${GITHUB_TOKEN} ./scripts/github-upload-assets.sh ${TAG} ./dist/assets
 
+docker: DOCKER_REPO:=ivanilves/lstags
+docker: RELEASE_TAG:=latest
 docker:
-	@docker container run -v $(shell pwd):/go/src/github.com/ivanilves/lstags -w /go/src/github.com/ivanilves/lstags -v /var/run/docker.sock:/var/run/docker.sock golang:1.8 scripts/prepare-docker-build.sh
-	@docker image build -t ivanilves/lstags .
+	@docker image build -t ${DOCKER_REPO}:${RELEASE_TAG} .