From efbc3f1e921969a0404e4ec1ca1f9cfd770c91ce Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 13 Dec 2022 17:14:08 +0000
Subject: [PATCH] Updating dev compose to use test image.

---
 hosting/docker-compose.dev.yaml | 64 +++++++--------------------------
 hosting/nginx.dev.conf.hbs      |  4 +--
 hosting/tests/Dockerfile        |  1 +
 hosting/tests/runner.sh         |  2 +-
 4 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml
index 7322b0e8a9..b4556b5688 100644
--- a/hosting/docker-compose.dev.yaml
+++ b/hosting/docker-compose.dev.yaml
@@ -3,24 +3,23 @@ version: "3"
 # optional ports are specified throughout for more advanced use cases.
 
 services:
-  minio-service:
-    container_name: budi-minio-dev
+  dev-service:
+    container_name: budi-dev
     restart: on-failure
-    image: minio/minio
-    volumes:
-      - minio_data:/data
+    image: budibase/tests
     ports:
       - "${MINIO_PORT}:9000"
       - "9001:9001"
+      - "${COUCH_DB_PORT}:5984"
+      - "${REDIS_PORT}:6379"
     environment:
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
-    command: server /data --console-address ":9001"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
-      interval: 30s
-      timeout: 20s
-      retries: 3
+      COUCHDB_PASSWORD: ${COUCH_DB_PASSWORD}
+      COUCHDB_USER: ${COUCH_DB_USER}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+    volumes:
+      - dev_data:/data
 
   proxy-service:
     container_name: budi-nginx-dev
@@ -32,47 +31,10 @@ services:
     ports:
       - "${MAIN_PORT}:10000"
     depends_on:
-      - minio-service
-      - couchdb-service
+      - dev-service
     extra_hosts:
       - "host.docker.internal:host-gateway"
 
-  couchdb-service:
-    # platform: linux/amd64
-    container_name: budi-couchdb-dev
-    restart: on-failure
-    image: ibmcom/couchdb3
-    environment:
-      - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
-      - COUCHDB_USER=${COUCH_DB_USER}
-    ports:
-      - "${COUCH_DB_PORT}:5984"
-    volumes:
-      - couchdb3_data:/opt/couchdb/data
-  
-  couch-init:
-    container_name: budi-couchdb-init-dev
-    image: curlimages/curl
-    environment:
-      PUT_CALL: "curl -u ${COUCH_DB_USER}:${COUCH_DB_PASSWORD} -X PUT couchdb-service:5984"
-    depends_on:
-      - couchdb-service
-    command: ["sh","-c","sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;"]
-
-  redis-service:
-    container_name: budi-redis-dev
-    restart: on-failure
-    image: redis
-    command: redis-server --requirepass ${REDIS_PASSWORD}
-    ports:
-      - "${REDIS_PORT}:6379"
-    volumes:
-      - redis_data:/data
-
 volumes:
-  couchdb3_data:
-    driver: local
-  minio_data:
-    driver: local
-  redis_data:
-    driver: local
+  dev_data:
+    driver: local
\ No newline at end of file
diff --git a/hosting/nginx.dev.conf.hbs b/hosting/nginx.dev.conf.hbs
index 93a07435e5..51678d23e8 100644
--- a/hosting/nginx.dev.conf.hbs
+++ b/hosting/nginx.dev.conf.hbs
@@ -53,7 +53,7 @@ http {
     }
 
     location /db/ {
-      proxy_pass      http://couchdb-service:5984;
+      proxy_pass      http://dev-service:5984;
       rewrite ^/db/(.*)$ /$1 break;
     }
 
@@ -183,7 +183,7 @@ http {
       proxy_set_header Connection "";
       chunked_transfer_encoding off;
 
-      proxy_pass      http://minio-service:9000;
+      proxy_pass      http://dev-service:9000;
     }
 
     client_header_timeout 60;
diff --git a/hosting/tests/Dockerfile b/hosting/tests/Dockerfile
index 9753796383..c39cb62931 100644
--- a/hosting/tests/Dockerfile
+++ b/hosting/tests/Dockerfile
@@ -17,6 +17,7 @@ RUN chmod +x ./runner.sh
 
 EXPOSE 5984
 EXPOSE 9000
+EXPOSE 9001
 EXPOSE 6379
 
 CMD ["./runner.sh"]
diff --git a/hosting/tests/runner.sh b/hosting/tests/runner.sh
index 54a00490c8..ddef044b3c 100644
--- a/hosting/tests/runner.sh
+++ b/hosting/tests/runner.sh
@@ -2,7 +2,7 @@
 
 redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
 /bbcouch-runner.sh &
-/minio/minio server ${DATA_DIR}/minio > /dev/stdout 2>&1 &
+/minio/minio server ${DATA_DIR}/minio --console-address ":9001" > /dev/stdout 2>&1 &
 
 echo "Test environment started..."
 sleep infinity
\ No newline at end of file