From 13abac5794cbdd6803dbebd2b9bf0f6c8303ea12 Mon Sep 17 00:00:00 2001
From: mrjones-plip <mrjones-plip@plip.com>
Date: Mon, 10 Feb 2025 15:17:26 -0800
Subject: [PATCH] use new couchdb image, refactor compose file, add debug to
 bootstrap.js

---
 docker-compose.test.yml | 36 +++++++++++++++---------------------
 docker-compose.yml      |  1 -
 tests/bootstrap.js      |  4 ++--
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 46ec693..81ba628 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,26 +1,27 @@
-version: '3.7'
 services:
   couch:
-    image: couchdb:2.3.1
+    image: public.ecr.aws/medic/cht-couchdb:4.17.0
     environment:
-      COUCHDB_USER: cht
-      COUCHDB_PASSWORD: cht-password
-    networks:
-      - cht-net
+      - "COUCHDB_USER=cht"
+      - "COUCHDB_PASSWORD=cht-password"
+      - "COUCHDB_SECRET=424a71c9-bb2b-44ba-9ea2-2ae97e78f41d"
+      - "COUCHDB_UUID=424a71c9-bb2b-44ba-9ea2-2ae97e78f41d"
+      - "SVC_NAME=couch"
+      - "COUCHDB_LOG_LEVEL=debug"
+    ports:
+      - 5984:5984
 
   postgres:
     image: medicmobile/cht-postgres:release-postgres13-rc.1
     environment:
-      POSTGRES_DB: cht
-      POSTGRES_USER: cht
-      POSTGRES_PASSWORD: cht_password
-      COUCH2PG_USER: cht_couch2pg
-      COUCH2PG_USER_PASSWORD: couch2pg_password
-      DB_OWNER_GROUP: cht_analytics
+      - "POSTGRES_DB=cht"
+      - "POSTGRES_USER=cht"
+      - "POSTGRES_PASSWORD=cht_password"
+      - "COUCH2PG_USER=cht_couch2pg"
+      - "COUCH2PG_USER_PASSWORD=couch2pg_password"
+      - "DB_OWNER_GROUP=cht_analytics"
     volumes:
     - cht-postgres-data:/var/lib/postgresql/data
-    networks:
-    - cht-net
     ports:
     - ${PG_PORT:-5432}:5432
 
@@ -39,17 +40,10 @@ services:
       POSTGRES_PASSWORD: cht_password
       POSTGRES_SERVER_NAME: ${POSTGRES_SERVER_NAME:-postgres}
       POSTGRES_DB_NAME: cht
-
-    networks:
-      - cht-net
     depends_on:
       - postgres
       - couch
 
-networks:
-  cht-net:
-    name: cht-net
-
 volumes:
   cht-postgres-data:
     name: cht-postgres-data
diff --git a/docker-compose.yml b/docker-compose.yml
index 80093d8..e4ecf78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 services:
 
   postgres:
diff --git a/tests/bootstrap.js b/tests/bootstrap.js
index 18424b0..c3b1fe3 100644
--- a/tests/bootstrap.js
+++ b/tests/bootstrap.js
@@ -57,7 +57,7 @@ const waitForPg = async (dbUrl) => {
       return true;
     } catch(err) {
       if(err.code !== 'ECONNREFUSED') {
-        console.log(err);
+        console.log('Failed to connect to postgres server', dbUrl, err);
         process.exit(1);
       }
     }
@@ -87,7 +87,7 @@ before(async () => {
   if (!process.env.TEST_PG_URL) {
     throw new Error('TEST_PG_URL is undefined.');
   }
-
+  console.log('Node Version',process.version);
   await waitForCouch(process.env.TEST_COUCH_URL);
   await waitForPg(process.env.TEST_PG_URL);
 });