Merge branch 'norelease/better-docker-build'

* norelease/better-docker-build:
  FEATURE: Make `docker build` more robust 💪

.travis.yml

@@ -31,13 +31,13 @@ script:
   - if [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then make blackbox-integration-test; fi
   - make lint
   - make vet
+  - make docker-image DOCKER_TAG=release
 
 after_script:
   - sudo killall -v dockerd
 
 before_deploy:
   - make release
-  - make docker-image DOCKER_TAG=release
 
 deploy:
   provider: script

Dockerfile

@@ -3,5 +3,7 @@ FROM scratch
 COPY ca-certificates.crt /etc/ssl/certs/
 # * compiled lstags binary [we assume you've run `make build GOOS=linux` before]
 COPY ./dist/assets/lstags-linux/lstags /lstags
+# Make sure we [are statically linked and] can run inside a scratch-based container
+RUN ["/lstags", "--version"]
 ENTRYPOINT ["/lstags"]
 CMD ["--help"]

Makefile

@@ -69,12 +69,14 @@ fail-on-errors:
 
 docker-image: DOCKER_REPO:=ivanilves/lstags
 docker-image: DOCKER_TAG:=latest
+docker-image: GOOS:=linux
+docker-image: build
 docker-image:
-	@docker image build -t ${DOCKER_REPO}:${DOCKER_TAG} .
+	@docker image build --no-cache -t ${DOCKER_REPO}:${DOCKER_TAG} .
 
 build: NAME=$(shell test "${GOOS}" = "windows" && echo 'lstags.exe' || echo 'lstags')
 build:
-	@if [[ -z "${GOOS}" ]]; then go build -ldflags '-s -w' -a -tags netgo -installsuffix netgo; fi
+	@if [[ -z "${GOOS}" ]]; then go build -ldflags '-d -s -w' -a -tags netgo -installsuffix netgo; fi
 	@if [[ -n "${GOOS}" ]]; then mkdir -p dist/assets/lstags-${GOOS}; GOOS=${GOOS} go build -ldflags '-s -w' -a -tags netgo -installsuffix netgo -o dist/assets/lstags-${GOOS}/${NAME}; fi
 
 xbuild:

util/fix/fix.go

@@ -1,13 +1,11 @@
 package fix
 
 import (
-	"os/user"
+	"os"
 	"strings"
 )
 
 // Path resolves "~" intro the real home path
 func Path(path string) string {
-	u, _ := user.Current()
-
-	return strings.Replace(path, "~", u.HomeDir, 1)
+	return strings.Replace(path, "~", os.Getenv("HOME"), 1)
 }