From 52f16bf1bcc35295e377fc503f1b4e0624aa5591 Mon Sep 17 00:00:00 2001
From: Joakim Olsson <joakim@unbound.se>
Date: Tue, 12 Mar 2019 11:11:53 +0100
Subject: [PATCH] Improve caching

---
 .gitlab-ci.yml | 13 +++++++++++++
 Dockerfile     |  9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6de0f3f..d6c3c83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,19 @@ stages:
 
 variables:
   DOCKER_HOST: tcp://docker:2375/
+  GOCACHE: "${CI_PROJECT_DIR}/_go/cache"
+
+before_script:
+  - mkdir -p ${CI_PROJECT_DIR}/_go/{pkg,bin,cache}
+  - rm -rf /go/pkg
+  - ln -s ${CI_PROJECT_DIR}/_go/pkg /go/pkg
+  - ln -s ${CI_PROJECT_DIR}/_go/bin /go/bin
+
+cache:
+  key: "$CI_COMMIT_REF_NAME"
+  paths:
+    - _go
+  untracked: true
 
 image: registry.gitlab.com/sparetimecoders/build-tools
 
diff --git a/Dockerfile b/Dockerfile
index 4b0b93b..bb59fb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,12 @@
-FROM golang:1.11-stretch as builder
+FROM golang:1.12 as deps
 WORKDIR /build
 COPY go.mod go.sum ./
-RUN go get
+RUN go get -mod=readonly
+
+FROM golang:1.12 as builder
+WORKDIR /build
 COPY * ./
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o default-request-adder .
+RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -a -installsuffix cgo -o default-request-adder .
 
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/