Merge branch 'release/1.3.1'

.dockerignore

@@ -1,3 +1,4 @@
+compiled/*
 Dockerfile
 Dockerfile.crosscompile
 Dockerfile.tester

Dockerfile

@@ -1,18 +1,22 @@
-#use the golang base image
-FROM golang:1.8
-MAINTAINER Daniël van Gils
+FROM golang:1.12 AS tester
+MAINTAINER Cloud 66 Engineering
 
-#get govener for package management
-#get all the go testing stuff
-#Installing Golang-Dep
-#copy the source files
-RUN go get -u github.com/kardianos/govendor && \
-    go get github.com/onsi/ginkgo/ginkgo && \
-    go get github.com/onsi/gomega && \
-    curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh && \
-    mkdir -p /usr/local/go/src/github.com/cloud66-oss/habitus
-
+RUN apt-get update -y && apt-get upgrade -y
+
+ENV APP_DIR=$GOPATH/src/github.com/cloud66-oss/habitus
+RUN mkdir -p $APP_DIR
+COPY . $APP_DIR
+WORKDIR $APP_DIR
+
+CMD ["go", "test", ".", "./configuration"]
+
+FROM tester AS builder
+
+RUN go get github.com/mitchellh/gox
+RUN mkdir -p /usr/local/go/src/github.com/cloud66-oss/habitus
 COPY . /usr/local/go/src/github.com/cloud66-oss/habitus
 
 #switch to our app directory
 WORKDIR /usr/local/go/src/github.com/cloud66-oss/habitus
+
+RUN ./compile.sh `git describe --abbrev=0 --tags`

Dockerfile.crosscompile

@@ -1,5 +1,5 @@
 #use the golang base image
-FROM golang:1.8
+FROM golang:1.12
 MAINTAINER Daniël van Gils
 
 RUN go get github.com/mitchellh/gox

Dockerfile.tester

@@ -1,5 +1,5 @@
 #use the golang base image
-FROM golang:1.8
+FROM golang:1.12
 MAINTAINER Daniël van Gils
 
 #get all the go testing stuff