From 18ab01aae988082b2a6994fbbdd633bc0c87f865 Mon Sep 17 00:00:00 2001
From: Joakim Olsson <joakim@unbound.se>
Date: Tue, 12 Mar 2019 12:19:09 +0100
Subject: [PATCH] Move stuff to .gitlabci.yml and simplify Dockerfile

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6c3c83..da27f26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,14 @@
-stages:
-  - build
-
 variables:
-  DOCKER_HOST: tcp://docker:2375/
   GOCACHE: "${CI_PROJECT_DIR}/_go/cache"
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_DRIVER: overlay2
 
 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
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
 cache:
   key: "$CI_COMMIT_REF_NAME"
@@ -17,12 +16,58 @@ cache:
     - _go
   untracked: true
 
-image: registry.gitlab.com/sparetimecoders/build-tools
+stages:
+  - deps
+  - test
+  - build
+
+deps:
+  stage: deps
+  image: golang:1.12
+  script:
+    - go get -mod=readonly
+
+test:
+  stage: test
+  dependencies:
+    - deps
+  image: golang:1.12
+  script:
+    - go fmt -mod=readonly $(go list ./...)
+    - go vet -mod=readonly $(go list ./...)
+    - CGO_ENABLED=1 go test -mod=readonly -race $(go list ./...) -coverprofile .testCoverage.txt
 
 build:
   stage: build
+  dependencies:
+    - deps
+  image: golang:1.12
+  script:
+    - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -mod=readonly -o release/k8s-go -ldflags '-w -s'
+  artifacts:
+    paths:
+      - release/
+
+docker:
+  stage: build
+  dependencies:
+    - build
+  image: docker:stable
   services:
     - docker:dind
   script:
-    - build
-    - push
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+release:
+  stage: build
+  dependencies:
+    - docker
+  image: docker:stable
+  services:
+    - docker:dind
+  script:
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    - docker push $CI_REGISTRY_IMAGE:latest
+  only:
+    - master
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index bb59fb4..3944eee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,3 @@
-FROM golang:1.12 as deps
-WORKDIR /build
-COPY go.mod go.sum ./
-RUN go get -mod=readonly
-
-FROM golang:1.12 as builder
-WORKDIR /build
-COPY * ./
-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/
-COPY --from=builder /build/default-request-adder /
+COPY default-request-adder /
 CMD ["/default-request-adder"]