simplified connector listen addresses

neo4j-php · Dec 1, 2021 · fefff92 · fefff92
1 parent 7998555
commit fefff92
Showing 1 changed file with 32 additions and 33 deletions.
diff --git a/.github/workflows/full-test.yml b/.github/workflows/full-test.yml
@@ -31,20 +31,22 @@ jobs:
     services:
       neo4j:
         image: neo4j:4.3
-        env:
-          NEO4J_AUTH: neo4j/test
-          NEO4JLABS_PLUGINS: '["apoc"]'
         options: >-
           --health-cmd "wget http://localhost:7474 || exit 1"
-          --health-interval 30s
-          --health-timeout 10s
-          --health-retries 5
         ports:
           - 7687:7687
           - 7474:7474
+        env:
+          NEO4J_AUTH: neo4j/test
+          NEO4JLABS_PLUGINS: '["apoc"]'
 
       core1:
         image: neo4j:4.3-enterprise
+        options: >-
+          --health-cmd "wget http://localhost:7475 || exit 1"
+        ports:
+          - 7688:7688
+          - 7475:7475
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
           NEO4JLABS_PLUGINS: '["apoc"]'
@@ -57,15 +59,16 @@ jobs:
           NEO4J_causal__clustering_discovery__listen__address: 0.0.0.0:5000
           NEO4J_causal__clustering_transaction__listen__address: 0.0.0.0:6000
           NEO4J_causal__clustering_raft__listen__address: 0.0.0.0:7000
-          NEO4J_dbms_connector_bolt_advertised__address: localhost:17687
-          NEO4J_dbms_connector_http_advertised__address: localhost:17474
-        options: >-
-          --health-cmd "wget http://localhost:7474 || exit 1"
-        ports:
-          - 17687:7687
-          - 17474:7474
+          NEO4J_dbms_connector_http_listen__address: 0.0.0.0:7475
+          NEO4J_dbms_connector_bolt_listen__address: 0.0.0.0:7688
+
       core2:
         image: neo4j:4.3-enterprise
+        options: >-
+          --health-cmd "wget http://localhost:7476 || exit 1"
+        ports:
+          - 7689:7689
+          - 7476:7476
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
           NEO4JLABS_PLUGINS: '["apoc"]'
@@ -78,14 +81,16 @@ jobs:
           NEO4J_causal__clustering_discovery__listen__address: 0.0.0.0:5000
           NEO4J_causal__clustering_transaction__listen__address: 0.0.0.0:6000
           NEO4J_causal__clustering_raft__listen__address: 0.0.0.0:7000
-          NEO4J_dbms_connector_bolt_advertised__address: localhost:27687
-          NEO4J_dbms_connector_http_advertised__address: localhost:27474
-        ports:
-          - 27687:7687
-          - 27474:7474
+          NEO4J_dbms_connector_http_listen__address: 0.0.0.0:7476
+          NEO4J_dbms_connector_bolt_listen__address: 0.0.0.0:7689
 
       core3:
         image: neo4j:4.3-enterprise
+        options: >-
+          --health-cmd "wget http://localhost:7477 || exit 1"
+        ports:
+          - 7690:7690
+          - 7477:7477
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
           NEO4JLABS_PLUGINS: '["apoc"]'
@@ -98,16 +103,16 @@ jobs:
           NEO4J_causal__clustering_discovery__listen__address: 0.0.0.0:5000
           NEO4J_causal__clustering_transaction__listen__address: 0.0.0.0:6000
           NEO4J_causal__clustering_raft__listen__address: 0.0.0.0:7000
-          NEO4J_dbms_connector_bolt_advertised__address: localhost:37687
-          NEO4J_dbms_connector_http_advertised__address: localhost:37474
-        options: >-
-          --health-cmd "wget http://localhost:7474 || exit 1"
-        ports:
-          - 37687:7687
-          - 37474:7474
+          NEO4J_dbms_connector_http_listen__address: 0.0.0.0:7477
+          NEO4J_dbms_connector_bolt_listen__address: 0.0.0.0:7690
 
       readreplica1:
         image: neo4j:4.3-enterprise
+        options: >-
+          --health-cmd "wget http://localhost:7478 || exit 1"
+        ports:
+          - 7691:7691
+          - 7478:7478
         env:
           NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
           NEO4JLABS_PLUGINS: '["apoc"]'
@@ -120,11 +125,5 @@ jobs:
           NEO4J_causal__clustering_discovery__listen__address: 0.0.0.0:5000
           NEO4J_causal__clustering_transaction__listen__address: 0.0.0.0:6000
           NEO4J_causal__clustering_raft__listen__address: 0.0.0.0:7000
-          NEO4J_dbms_connector_bolt_advertised__address: localhost:47687
-          NEO4J_dbms_connector_http_advertised__address: localhost:47474
-        options: >-
-          --health-cmd "wget http://localhost:7474 || exit 1"
-        ports:
-          - 47687:7687
-          - 47474:7474
-
+          NEO4J_dbms_connector_http_listen__address: 0.0.0.0:7478
+          NEO4J_dbms_connector_bolt_listen__address: 0.0.0.0:7691