From 53bf17a11084aaf1e84fcf86beb6834dc84a4bdd Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 20 Jan 2023 19:56:47 +0000
Subject: [PATCH] Updating image to use new couchdb image.

---
 hosting/docker-compose.dev.yaml | 63 ++++++++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml
index a6752ad67c..c40bc32908 100644
--- a/hosting/docker-compose.dev.yaml
+++ b/hosting/docker-compose.dev.yaml
@@ -3,23 +3,25 @@ version: "3"
 # optional ports are specified throughout for more advanced use cases.
 
 services:
-  dev-service:
-    container_name: budi-dev
+  minio-service:
+    container_name: budi-minio-dev
     restart: on-failure
-    image: budibase/tests
+    # Last version that supports the "fs" backend
+    image: minio/minio:RELEASE.2022-10-24T18-35-07Z
+    volumes:
+      - minio_data:/data
     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}
-      COUCHDB_PASSWORD: ${COUCH_DB_PASSWORD}
-      COUCHDB_USER: ${COUCH_DB_USER}
-      REDIS_PASSWORD: ${REDIS_PASSWORD}
-    volumes:
-      - dev_data:/data
+    command: server /data --console-address ":9001"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
 
   proxy-service:
     container_name: budi-nginx-dev
@@ -31,12 +33,49 @@ services:
     ports:
       - "${MAIN_PORT}:10000"
     depends_on:
-      - dev-service
+      - minio-service
+      - couchdb-service
     extra_hosts:
       - "host.docker.internal:host-gateway"
     environment:
       - PROXY_ADDRESS=host.docker.internal
 
+  couchdb-service:
+    # platform: linux/amd64
+    container_name: budi-couchdb3-dev
+    restart: on-failure
+    image: budibase/couchdb
+    environment:
+      - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD}
+      - COUCHDB_USER=${COUCH_DB_USER}
+    ports:
+      - "${COUCH_DB_PORT}:5984"
+    volumes:
+      - couchdb_data:/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:
-  dev_data:
+  couchdb_data:
+    driver: local
+  minio_data:
+    driver: local
+  redis_data:
     driver: local
\ No newline at end of file