From d67d60a3dd7fa5e1664ed5b8382390808e61e6f4 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Wed, 9 Oct 2019 17:40:04 +0200
Subject: [PATCH] Migrate Makefile tasks, dockerfiles to go modules

---
 Dockerfile.corteza-server           |  2 +-
 Dockerfile.corteza-server-compose   |  2 +-
 Dockerfile.corteza-server-messaging |  2 +-
 Dockerfile.corteza-server-system    |  2 +-
 Makefile                            | 21 +++++----------------
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Dockerfile.corteza-server b/Dockerfile.corteza-server
index 490589078..31f801266 100644
--- a/Dockerfile.corteza-server
+++ b/Dockerfile.corteza-server
@@ -1,7 +1,7 @@
 ## builder image
 FROM cortezaproject/corteza-server-builder:latest AS builder
 
-WORKDIR /go/src/github.com/cortezaproject/corteza-server
+WORKDIR /cortrza/src
 
 COPY . .
 
diff --git a/Dockerfile.corteza-server-compose b/Dockerfile.corteza-server-compose
index dd4d89a22..0b867ce97 100644
--- a/Dockerfile.corteza-server-compose
+++ b/Dockerfile.corteza-server-compose
@@ -1,7 +1,7 @@
 ## builder image
 FROM cortezaproject/corteza-server-builder:latest AS builder
 
-WORKDIR /go/src/github.com/cortezaproject/corteza-server
+WORKDIR /corteza/src
 
 COPY . .
 
diff --git a/Dockerfile.corteza-server-messaging b/Dockerfile.corteza-server-messaging
index e6c4989f4..454d51c35 100644
--- a/Dockerfile.corteza-server-messaging
+++ b/Dockerfile.corteza-server-messaging
@@ -1,7 +1,7 @@
 ## builder image
 FROM cortezaproject/corteza-server-builder:latest AS builder
 
-WORKDIR /go/src/github.com/cortezaproject/corteza-server
+WORKDIR /corteza/src
 
 COPY . .
 
diff --git a/Dockerfile.corteza-server-system b/Dockerfile.corteza-server-system
index 4dcbde796..334be40fb 100644
--- a/Dockerfile.corteza-server-system
+++ b/Dockerfile.corteza-server-system
@@ -1,7 +1,7 @@
 ## builder image
 FROM cortezaproject/corteza-server-builder:latest AS builder
 
-WORKDIR /go/src/github.com/cortezaproject/corteza-server
+WORKDIR /corteza/src
 
 COPY . .
 
diff --git a/Makefile b/Makefile
index 292238a2e..0946a0bac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: help docker docker-push realize dep dep.update qa critic vet codegen integration
+.PHONY: help docker docker-push realize qa critic vet codegen integration
 
 GO        = go
 GOGET     = $(GO) get -u
@@ -38,7 +38,6 @@ TEST_SUITE_all         = $(TEST_SUITE_unit) $(TEST_SUITE_integration)
 
 ########################################################################################################################
 # Tool bins
-DEP         = $(GOPATH)/bin/dep
 REALIZE     = ${GOPATH}/bin/realize
 GOCRITIC    = ${GOPATH}/bin/gocritic
 MOCKGEN     = ${GOPATH}/bin/mockgen
@@ -84,12 +83,6 @@ docker-push.%: Dockerfile.%
 realize: $(REALIZE)
 	$(REALIZE) start
 
-dep.update: $(DEP)
-	$(DEP) ensure -update -v
-
-dep: $(DEP)
-	$(DEP) ensure -v
-
 codegen: $(PROTOGEN)
 	./codegen.sh
 
@@ -125,6 +118,10 @@ test.integration.%:
 test.all:
 	$(GOTEST) $(TEST_FLAGS) $(TEST_SUITE_all)
 
+# Unit testing testing messaging, system or compose
+test.unit.%:
+	$(GOTEST) $(TEST_FLAGS) ./$*/...
+
 # Runs ALL tests
 test.unit:
 	$(GOTEST) $(TEST_FLAGS) $(TEST_SUITE_unit)
@@ -133,11 +130,6 @@ test.unit:
 test.pkg:
 	$(GOTEST) $(TEST_FLAGS) $(TEST_SUITE_pkg)
 
-
-# Testing messaging, system, compose
-test.%:
-	$(GOTEST) $(TEST_FLAGS) ./$*/...
-
 test: test.unit
 
 # Outputs cross-package imports that should not be there.
@@ -183,9 +175,6 @@ $(REALIZE):
 $(GOCRITIC):
 	$(GOGET) github.com/go-critic/go-critic/...
 
-$(DEP):
-	$(GOGET) github.com/tools/godep
-
 $(MOCKGEN):
 	$(GOGET) github.com/golang/mock/gomock
 	$(GOGET) github.com/golang/mock/mockgen