From 0bd454cc448b812da6c693b451d86ff4cadbb6b2 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Wed, 3 Jul 2019 15:31:38 +0100
Subject: Use the static container image

This includes ca-certs in the docker image

Fixes #82
---
 .travis.yml | 1 +
 Dockerfile  | 2 +-
 Makefile    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 50ddc92..9f3251d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ env:
   - SUITE=test
 
 go:
+  - 1.12.x
   - 1.11.x
   - 1.10.x
   - tip
diff --git a/Dockerfile b/Dockerfile
index 7910e51..8349905 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR ${SRC_DIR}
 ADD . ${SRC_DIR}
 RUN CGO_ENABLED=0 GOOS=linux make install-cashierd
 
-FROM scratch
+FROM gcr.io/distroless/static
 LABEL maintainer="nsheridan@gmail.com"
 WORKDIR /cashier
 COPY --from=build /go/bin/cashierd /
diff --git a/Makefile b/Makefile
index 46b0064..db969b8 100644
--- a/Makefile
+++ b/Makefile
@@ -24,13 +24,13 @@ lint: dep
 build: cashier cashierd
 
 generate:
-	go generate -x ./...
+	go generate ./...
 
 %-cmd:
 	CGO_ENABLED=$(CGO_ENABLED) GOARCH=$(GOARCH) GOOS=$(GOOS) go build -ldflags="-X $(VERSION_PKG)=$(VERSION)" -o $* ./cmd/$*
 
 install-%: generate
-	CGO_ENABLED=$(CGO_ENABLED) GOARCH=$(GOARCH) GOOS=$(GOOS) go install -x -ldflags="-X $(VERSION_PKG)=$(VERSION)" ./cmd/$*
+	CGO_ENABLED=$(CGO_ENABLED) GOARCH=$(GOARCH) GOOS=$(GOOS) go install -ldflags="-X $(VERSION_PKG)=$(VERSION)" ./cmd/$*
 
 clean:
 	rm -f cashier cashierd
-- 
cgit v1.2.3