improved docker test environment (#153)

* Test environment enhancement - @osteensco

Makefile

@@ -21,8 +21,18 @@ test-race:
 	env RACE=true OUT=sugardb/testdata make build-modules-test && \
 	CGO_ENABLED=1 go test ./... --race
 
-test-win:
+testenv-run:
-	docker-compose -f windows_test_env/docker-compose.yaml up
+	docker-compose -f test_env/run/docker-compose.yaml build
+	docker-compose -f test_env/run/docker-compose.yaml run projenv
+
+testenv-test:
+	docker-compose -f test_env/test/docker-compose.yaml up --build
+	
+testenv-test-race:
+	docker-compose -f test_env/test_race/docker-compose.yaml up --build
+
+testenv-all:
+	docker-compose -f test_env/all/docker-compose.yaml up --build
 
 cover:
 	go tool cover -html=./coverage/coverage.out

test_env/all/docker-compose.yaml

@@ -0,0 +1,12 @@
+# run from root dir
+services:
+  test:
+    build: 
+      context: ../..
+      dockerfile: test_env/all/Dockerfile
+    container_name: sugardb_test_env_all
+    volumes:
+      - ../../coverage/coverage.out:/testspace/coverage/coverage.out
+    stdin_open: true
+    tty: true
+

test_env/run/Dockerfile

@@ -0,0 +1,8 @@
+# run docker-compose from root dir
+FROM golang:latest
+
+WORKDIR /testspace
+
+COPY . ./
+
+CMD ["/bin/bash"]

test_env/run/docker-compose.yaml

@@ -0,0 +1,10 @@
+# run from root dir
+services:
+  projenv:
+    build: 
+      context: ../..
+      dockerfile: test_env/run/Dockerfile
+    container_name: sugardb_test_env_run
+    stdin_open: true
+    tty: true
+

test_env/test/Dockerfile

@@ -0,0 +1,8 @@
+# run docker-compose from root dir
+FROM golang:latest
+
+WORKDIR /testspace
+
+COPY . ./
+
+CMD make test;

test_env/test/docker-compose.yaml

@@ -0,0 +1,12 @@
+# run from root dir
+services:
+  test:
+    build: 
+      context: ../..
+      dockerfile: test_env/test/Dockerfile
+    container_name: sugardb_test_env_test
+    volumes:
+      - ../../coverage/coverage.out:/testspace/coverage/coverage.out
+    stdin_open: true
+    tty: true
+

test_env/test_race/Dockerfile

@@ -0,0 +1,8 @@
+# run docker-compose from root dir
+FROM golang:latest
+
+WORKDIR /testspace
+
+COPY . ./
+
+CMD make test-race;

test_env/test_race/docker-compose.yaml

@@ -0,0 +1,12 @@
+# run from root dir
+services:
+  test:
+    build: 
+      context: ../..
+      dockerfile: test_env/test_race/Dockerfile
+    container_name: sugardb_test_env_test_race
+    volumes:
+      - ../../coverage/coverage.out:/testspace/coverage/coverage.out
+    stdin_open: true
+    tty: true
+

windows_test_env/docker-compose.yaml

@@ -1,12 +0,0 @@
-# run from root dir
-services:
-  test:
-    build: 
-      context: ..
-      dockerfile: windows_test_env/Dockerfile
-    container_name: sugardb_win_test_env
-    volumes:
-      - ../coverage/coverage.out:/testspace/coverage/coverage.out
-    stdin_open: true
-    tty: true
-