Merge pull request #237 from dbist/dotnet

various fixes
dbist · Oct 5, 2023 · f7716a5 · f7716a5
2 parents fc142f4 + 742f2b7
commit f7716a5
Showing 1 changed file with 2 additions and 54 deletions.
diff --git a/docker-compose-dotnet.yml b/docker-compose-dotnet.yml
@@ -2,58 +2,6 @@ version: '3.9'
 
 services:
 
-  roach-0:
-    container_name: roach-0
-    hostname: roach-0
-    image: cockroachdb/cockroach:latest-v22.2
-    command: start  --insecure --join=roach-0,roach-1,roach-2 --listen-addr=roach-0:26257 --advertise-addr=roach-0:26257 --max-sql-memory=.25 --cache=.25
-    environment:
-      - 'ALLOW_EMPTY_PASSWORD=yes'
-
-  roach-1:
-    container_name: roach-1
-    hostname: roach-1
-    image: cockroachdb/cockroach:latest-v22.2
-    command: start  --insecure --join=roach-0,roach-1,roach-2 --listen-addr=roach-1:26257 --advertise-addr=roach-1:26257 --max-sql-memory=.25 --cache=.25
-    environment:
-      - 'ALLOW_EMPTY_PASSWORD=yes'
-
-  roach-2:
-    container_name: roach-2
-    hostname: roach-2
-    image: cockroachdb/cockroach:latest-v22.2
-    command: start  --insecure --join=roach-0,roach-1,roach-2 --listen-addr=roach-2:26257 --advertise-addr=roach-2:26257 --max-sql-memory=.25 --cache=.25
-    environment:
-      - 'ALLOW_EMPTY_PASSWORD=yes'
-
-  init:
-    container_name: init
-    image: cockroachdb/cockroach:latest-v22.2
-    command: init --host=roach-0 --insecure
-    depends_on:
-      - roach-0
-
-  lb:
-    container_name: lb
-    hostname: lb
-    build: haproxy
-    ports:
-      - "26000:26000"
-      - "8080:8080"
-      - "8081:8081"
-    depends_on:
-      - roach-0
-      - roach-1
-      - roach-2
-
-  client:
-    container_name: client
-    image: cockroachdb/cockroach:latest-v22.2
-    entrypoint: ["/usr/bin/tail", "-f", "/dev/null"]
-    hostname: client
-    depends_on:
-      - lb
-
   flyway:
     container_name: flyway
     hostname: flyway
@@ -63,7 +11,7 @@ services:
       - ./dotnet/flyway/sql:/flyway/sql
       - ./dotnet/flyway/conf:/flyway/conf
     healthcheck:
-      test: ["flyway", "info"]
+      test: ["CMD-SHELL", "flyway", "info"]
       interval: 10s
       timeout: 10s
       retries: 3
@@ -78,7 +26,7 @@ services:
       - "3000:3000"
     #restart: unless-stopped
     healthcheck:
-      test: ["curl", "http://lb:8080/_admin/v1/databases/bank"]
+      test: ["CMD-SHELL", "curl", "http://lb:8080/_admin/v1/databases/bank"]
       #test: ["cockroach", "sql", "--insecure", "--host=lb", "--port=26000", "-e", "WITH X AS (SHOW DATABASES) SELECT database_name FROM X WHERE database_name = 'bank';"]
       interval: 10s
       timeout: 30s