From 8fea22e7628f34db647554e6509fd6ecf49607d9 Mon Sep 17 00:00:00 2001
From: Dominic Breuker <dominic.breuker@gmail.com>
Date: Fri, 9 Mar 2018 17:30:33 +0100
Subject: [PATCH] copy .git folder explicity

---
 .circleci/config.yml         | 6 +++---
 .dockerignore                | 1 -
 Makefile                     | 2 +-
 docker/Dockerfile.testing    | 1 +
 docker/entrypoint-testing.sh | 2 --
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59d3c5e..2c5fd16 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,10 @@
 version: 2
 jobs:
   build:
-    machine: true
-      image: docker:17.05.0-ce-git
+    docker:
+      - image: docker:17.05.0-ce-git
     steps:
       - checkout
       - setup_remote_docker
       - run: docker build -f ./docker/Dockerfile.testing -t local/pspy-testing:latest . 
-      - run: docker run -it -v `pwd`/.git:/go/src/github.com/dominicbreuker/pspy/.git -e CC_TEST_REPORTER_ID=$CC_TEST_REPORTER_ID local/pspy-testing:latest
+      - run: docker run -it -e CC_TEST_REPORTER_ID=$CC_TEST_REPORTER_ID local/pspy-testing:latest
diff --git a/.dockerignore b/.dockerignore
index cc09622..f76e6ee 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,2 @@
-.git
 .gitignore
 images/
diff --git a/Makefile b/Makefile
index 3e6c17e..1dc3edf 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ TEST_DOCKERFILE = $(PROJECT_DIR)/docker/Dockerfile.testing
 
 test:
 	docker build -f $(TEST_DOCKERFILE) -t $(TEST_IMAGE) . 
-	docker run -it --rm -v $(PROJECT_DIR)/.git:/go/src/github.com/dominicbreuker/pspy/.git $(TEST_IMAGE)
+	docker run -it --rm $(TEST_IMAGE)
 
 dev-build:
 	docker build -f $(DEV_DOCKERFILE) -t $(DEV_IMAGE) .
diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing
index b6820f1..3f233d5 100644
--- a/docker/Dockerfile.testing
+++ b/docker/Dockerfile.testing
@@ -9,6 +9,7 @@ COPY main.go /go/src/github.com/dominicbreuker/pspy/main.go
 COPY cmd /go/src/github.com/dominicbreuker/pspy/cmd
 COPY internal /go/src/github.com/dominicbreuker/pspy/internal
 COPY vendor /go/src/github.com/dominicbreuker/pspy/vendor
+COPY .git /go/src/github.com/dominicbreuker/pspy/.git
 
 # run tests
 WORKDIR /go/src/github.com/dominicbreuker/pspy
diff --git a/docker/entrypoint-testing.sh b/docker/entrypoint-testing.sh
index c01e577..29ba89c 100644
--- a/docker/entrypoint-testing.sh
+++ b/docker/entrypoint-testing.sh
@@ -18,14 +18,12 @@ else
   ./cc-test-reporter before-build
 
   for pkg in $(go list ./... | grep -v main); do
-    echo "doing $pkg"
     go test -coverprofile=$(echo $pkg | tr / -).cover $pkg
   done
   echo "mode: set" > c.out
   grep -h -v "^mode:" ./*.cover >> c.out
   rm -f *.cover
 
-  echo "reporting now"
   ./cc-test-reporter after-build
 
   rm c.out