30 - Action create must not check db connection

raoptimus · Dec 8, 2023 · fa5b43f · fa5b43f
1 parent 738a431
commit fa5b43f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Sleep for 5 seconds
         uses: jakejarvis/wait-action@master
         with:
-          time: '5s'
+          time: '10s'
 
       - name: Run ps
         run: docker-compose -f "docker-compose.yml" ps

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,6 +33,12 @@ services:
       - clickhouse2
       - postgres
       - mysql
+    links:
+      - clickhouse
+      - clickhouse1
+      - clickhouse2
+      - postgres
+      - mysql
     volumes:
       - "./:/usr/src/app"
       - "~/.cache/go-build:/root/.cache/go-build"
@@ -52,6 +58,8 @@ services:
       - "./docker/volume/clickhouse-cluster/config/config_replica.xml:/etc/clickhouse-server/clickhouse_replication_config.xml"
     depends_on:
       - zookeeper
+    links:
+      - zookeeper
 
   clickhouse2:
     image: yandex/clickhouse-server:21.3.20.1-alpine
@@ -61,3 +69,5 @@ services:
       - "./docker/volume/clickhouse-cluster/config/config_replica.xml:/etc/clickhouse-server/clickhouse_replication_config.xml"
     depends_on:
       - zookeeper
+    links:
+      - zookeeper
diff --git a/docker/volume/clickhouse-cluster/config/config_replica.xml b/docker/volume/clickhouse-cluster/config/config_replica.xml
@@ -22,12 +22,4 @@
 			<port>2181</port>
 		</node>
 	</zookeeper-servers>
-
-	<zookeeper>
-		<node index="1">
-			<host>zookeeper</host>
-			<port>2181</port>
-		</node>
-<!--		<identity>user:password</identity>-->
-	</zookeeper>
 </yandex>