From 3a028750707331c77cf4a457b67f22a5441dfeba Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Mon, 8 May 2023 14:36:13 +0200
Subject: [PATCH] docker-compose.yml ; Dockerfile.test ; connect to `yugabyte`
 and not localhost

---
 extern/boostd-data/Dockerfile.test    |  8 ++++++++
 extern/boostd-data/docker-compose.yml | 19 +++++++++++++++++++
 extern/boostd-data/svc/svc_test.go    | 12 +++++++-----
 piecedirectory/doctor_test.go         |  6 +++---
 piecedirectory/piecedirectory_test.go |  6 +++---
 5 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 extern/boostd-data/Dockerfile.test
 create mode 100644 extern/boostd-data/docker-compose.yml

diff --git a/extern/boostd-data/Dockerfile.test b/extern/boostd-data/Dockerfile.test
new file mode 100644
index 000000000..24972f7b8
--- /dev/null
+++ b/extern/boostd-data/Dockerfile.test
@@ -0,0 +1,8 @@
+FROM golang:1.18-alpine
+
+WORKDIR /go/src/
+
+ENV CGO_ENABLED=0
+
+ENTRYPOINT ["go", "test"]
+CMD ["-v", "./..."]
diff --git a/extern/boostd-data/docker-compose.yml b/extern/boostd-data/docker-compose.yml
new file mode 100644
index 000000000..fc4be57bf
--- /dev/null
+++ b/extern/boostd-data/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '3.7'
+
+services:
+
+  yugabyte:
+    image: public.ecr.aws/n6b0k8i7/yugabyte-test:x86_64-2.17.2.0
+    ports:
+     - 9042:9042
+    restart: on-failure
+
+  go-tests:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.test
+    environment:
+      YUGABYTE_HOST: yugabyte
+    volumes:
+      - ./:/go/src/
+    command: -v -count=1 -p=1 ./... 
diff --git a/extern/boostd-data/svc/svc_test.go b/extern/boostd-data/svc/svc_test.go
index b5280e2e5..b78a17bd0 100644
--- a/extern/boostd-data/svc/svc_test.go
+++ b/extern/boostd-data/svc/svc_test.go
@@ -47,8 +47,10 @@ var testCouchSettings = couchbase.DBSettings{
 }
 
 var testYugaSettings = yugabyte.DBSettings{
-	Hosts:         []string{"127.0.0.1"},
-	ConnectString: "postgresql://postgres:postgres@localhost",
+	//Hosts:         []string{"127.0.0.1"},
+	Hosts: []string{"yugabyte"},
+	//ConnectString: "postgresql://postgres:postgres@localhost",
+	ConnectString: "postgresql://postgres:postgres@yugabyte",
 }
 
 func TestService(t *testing.T) {
@@ -84,7 +86,7 @@ func TestService(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 		defer cancel()
 
-		SetupYugabyte(t)
+		// SetupYugabyte(t)
 
 		bdsvc := NewYugabyte(testYugaSettings)
 
@@ -224,7 +226,7 @@ func TestServiceFuzz(t *testing.T) {
 	})
 
 	t.Run("yugabyte", func(t *testing.T) {
-		SetupYugabyte(t)
+		// SetupYugabyte(t)
 		bdsvc := NewYugabyte(testYugaSettings)
 
 		addr := "localhost:8044"
@@ -458,7 +460,7 @@ func TestCleanup(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 		defer cancel()
 
-		SetupYugabyte(t)
+		// SetupYugabyte(t)
 
 		bdsvc := NewYugabyte(testYugaSettings)
 		testCleanup(ctx, t, bdsvc, "localhost:8044")
diff --git a/piecedirectory/doctor_test.go b/piecedirectory/doctor_test.go
index 5c471be16..2150eceab 100644
--- a/piecedirectory/doctor_test.go
+++ b/piecedirectory/doctor_test.go
@@ -92,11 +92,11 @@ func TestPieceDoctor(t *testing.T) {
 		prev := yugabyte.MinPieceCheckPeriod
 		yugabyte.MinPieceCheckPeriod = 1 * time.Second
 
-		svc.SetupYugabyte(t)
+		// svc.SetupYugabyte(t)
 
 		bdsvc := svc.NewYugabyte(yugabyte.DBSettings{
-			Hosts:         []string{"127.0.0.1"},
-			ConnectString: "postgresql://postgres:postgres@localhost",
+			Hosts:         []string{"yugabyte"},
+			ConnectString: "postgresql://postgres:postgres@yugabyte",
 		})
 
 		addr := "localhost:8044"
diff --git a/piecedirectory/piecedirectory_test.go b/piecedirectory/piecedirectory_test.go
index e06613ad1..572172f53 100644
--- a/piecedirectory/piecedirectory_test.go
+++ b/piecedirectory/piecedirectory_test.go
@@ -46,11 +46,11 @@ func TestPieceDirectory(t *testing.T) {
 	})
 
 	t.Run("yugabyte", func(t *testing.T) {
-		svc.SetupYugabyte(t)
+		// svc.SetupYugabyte(t)
 
 		bdsvc := svc.NewYugabyte(yugabyte.DBSettings{
-			Hosts:         []string{"127.0.0.1"},
-			ConnectString: "postgresql://postgres:postgres@localhost",
+			Hosts:         []string{"yugabyte"},
+			ConnectString: "postgresql://postgres:postgres@yugabyte",
 		})
 
 		addr := "localhost:8044"