Skip to content

Commit 04fbf75

Browse files
transistivetransistive
committed
Merge branch 'main' of github.com:neo4j-php/neo4j-php-client
2 parents 4390103 + 04f495a commit 04fbf75

File tree

45 files changed

+93
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+93
-203
lines changed

‎.github/workflows/integration-test-cluster-neo4j-5.yml

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
tests:
1313
runs-on: ubuntu-latest
1414
env:
15-
CONNECTION: neo4j://neo4j:testtest@localhost:7688
16-
name: "Running on PHP 8.0 with a Neo4j 5.6.0-enterprise cluster"
15+
CONNECTION: neo4j://neo4j:testtest@localhost:7687
16+
name: "Running on PHP 8.0 with a Neo4j 5.10-enterprise cluster"
1717

1818
steps:
1919
- uses: actions/checkout@v2
@@ -38,72 +38,84 @@ jobs:
3838

3939
services:
4040
server1:
41-
image: neo4j:5.6.0-enterprise
41+
image: neo4j:5.10-enterprise
4242
ports:
43-
- 7688:7688
44-
- 7475:7475
43+
- 7687:7687
44+
- 7473:7473
45+
- 7474:7474
4546
env:
4647
NEO4J_initial_server_mode__constraint: PRIMARY
4748
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
4849
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
49-
NEO4j_server_bolt_advertised_address: localhost:7688
50-
NEO4j_server_http_advertised_address: localhost:7478
50+
NEO4j_server_bolt_advertised_address: localhost:7687
51+
NEO4j_server_http_advertised_address: localhost:7474
52+
NEO4J_PLUGINS: '["apoc"]'
5153
NEO4J_AUTH: neo4j/testtest
5254
options: >-
55+
--hostname server1
5356
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
5457
--health-start-period "60s"
5558
--health-interval "30s"
5659
--health-timeout "15s"
5760
--health-retries "5"
5861
server2:
59-
image: neo4j:5.6.0-enterprise
62+
image: neo4j:5.10-enterprise
6063
ports:
61-
- 7689:7689
62-
- 7476:7476
64+
- 8687:7687
65+
- 8473:7473
66+
- 8474:7474
6367
env:
6468
NEO4J_initial_server_mode__constraint: PRIMARY
6569
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
6670
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
67-
NEO4j_server_bolt_advertised_address: localhost:7689
68-
NEO4j_server_http_advertised_address: server2:7476
71+
NEO4j_server_bolt_advertised_address: localhost:8687
72+
NEO4j_server_http_advertised_address: localhost:8474
73+
NEO4J_PLUGINS: '["apoc"]'
6974
NEO4J_AUTH: neo4j/testtest
7075
options: >-
76+
--hostname server2
7177
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
7278
--health-start-period "60s"
7379
--health-interval "30s"
7480
--health-timeout "15s"
7581
--health-retries "5"
7682
server3:
77-
image: neo4j:5.6.0-enterprise
83+
image: neo4j:5.10-enterprise
7884
ports:
79-
- 7690:7690
80-
- 7477:7477
85+
- 9474:7474
86+
- 9473:7473
87+
- 9687:7687
8188
env:
8289
NEO4J_initial_server_mode__constraint: PRIMARY
8390
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
8491
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
85-
NEO4j_server_bolt_advertised_address: localhost:7690
86-
NEO4j_server_http_advertised_address: server3:7477
92+
NEO4j_server_bolt_advertised_address: localhost:9687
93+
NEO4j_server_http_advertised_address: localhost:9474
94+
NEO4J_PLUGINS: '["apoc"]'
8795
NEO4J_AUTH: neo4j/testtest
8896
options: >-
97+
--hostname server3
8998
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
9099
--health-start-period "60s"
91100
--health-interval "30s"
92101
--health-timeout "15s"
93102
--health-retries "5"
94103
read-server4:
95-
image: neo4j:5.6.0-enterprise
104+
image: neo4j:5.10-enterprise
96105
ports:
97-
- 7691:7691
98-
- 7478:7478
106+
- 10474:7474
107+
- 10473:7473
108+
- 10687:7687
99109
env:
100-
NEO4J_initial_server_mode__constraint: PRIMARY
110+
NEO4J_initial_server_mode__constraint: SECONDARY
101111
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
102112
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
103-
NEO4j_server_bolt_advertised_address: localhost:7691
104-
NEO4j_server_http_advertised_address: localhost:7478
113+
NEO4j_server_bolt_advertised_address: localhost:10687
114+
NEO4j_server_http_advertised_address: localhost:10474
115+
NEO4J_PLUGINS: '["apoc"]'
105116
NEO4J_AUTH: neo4j/testtest
106117
options: >-
118+
--hostname read-server4
107119
--health-cmd "wget -q --method=HEAD http://localhost:7474 || exit 1"
108120
--health-start-period "60s"
109121
--health-interval "30s"

‎.github/workflows/integration-test-single-server.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ on:
1111
jobs:
1212
tests:
1313
runs-on: ubuntu-latest
14-
name: "Running on PHP 8.2 with a Neo4j 5.5 instance connecting over all available protocols"
14+
name: "Running on PHP 8.2 with a Neo4j 5 instance connecting over all available protocols"
1515

1616
services:
1717
neo4j:
18-
image: neo4j:5.5
18+
image: neo4j:5
1919
env:
2020
NEO4J_AUTH: neo4j/testtest
2121
NEO4JLABS_PLUGINS: '["apoc"]'

‎docker-compose.yml

Lines changed: 27 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ x-definitions:
88
x-shared-cluster-env:
99
&common-cluster-env
1010
<<: *common-env
11-
NEO4J_EDITION: 'enterprise'
1211
NEO4J_ACCEPT_LICENSE_AGREEMENT: 'yes'
13-
EXTENDED_CONF: 'yes'
12+
NEO4J_dbms_cluster_discovery_endpoints: server1:5000,server2:5000,server3:5000
1413
x-shared-core-env:
1514
&common-core-env
1615
<<: *common-cluster-env
1716
NEO4J_initial_server_mode__constraint: 'PRIMARY'
1817
x-common:
1918
&common
20-
image: neo4j:5.5
21-
user: ${USER_ID}:${GROUP_ID}
19+
image: neo4j:5-enterprise
2220
healthcheck:
2321
test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider localhost:7474 || exit 1" ]
2422
env_file:
@@ -29,7 +27,6 @@ x-definitions:
2927
context: .
3028
dockerfile: Dockerfile
3129
image: neo4j-php-client:latest
32-
user: ${USER_ID}:${GROUP_ID}
3330
volumes:
3431
- .:/opt/project
3532
x-common-cluster:
@@ -38,8 +35,6 @@ x-definitions:
3835
image: neo4j:5-enterprise
3936
networks:
4037
neo4j-cluster:
41-
aliases:
42-
- neo4j-network
4338

4439
networks:
4540
neo4j:
@@ -57,95 +52,63 @@ services:
5752
- .env
5853
neo4j:
5954
<<: *common
55+
image: neo4j:5.10-community
6056
hostname: neo4j
6157
networks:
6258
- neo4j
63-
- neo4j-cluster
6459
ports:
65-
- "7687:7687"
66-
- "7474:7474"
60+
- "11687:7687"
61+
- "11474:7474"
6762
environment:
6863
<<: *common-env
69-
NEO4J_EDITION: community
70-
volumes:
71-
- ./neo4j/neo4j.conf:/conf/neo4j.conf
72-
- ./neo4j/data/neo4j:/var/lib/neo4j/data
73-
- ./neo4j/logs/neo4j:/var/lib/neo4j/logs
74-
- ./neo4j/conf/neo4j:/var/lib/neo4j/conf
75-
- ./neo4j/import/neo4j:/var/lib/neo4j/import
76-
- ./neo4j/metrics/neo4j:/var/lib/neo4j/metrics
77-
- ./neo4j/licenses/neo4j:/var/lib/neo4j/licenses
78-
- ./neo4j/ssl/neo4j:/var/lib/neo4j/ssl
64+
NEO4j_server_bolt_advertised_address: localhost:11687
65+
NEO4j_server_http_advertised_address: localhost:11474
7966

8067
server1:
8168
<<: *common-cluster
8269
hostname: server1
8370
ports:
84-
- "7688:7687"
85-
- "7475:7474"
86-
volumes:
87-
- ./neo4j/neo4j-cluster.conf:/conf/neo4j.conf
88-
- ./neo4j/data/server1:/var/lib/neo4j/data
89-
- ./neo4j/logs/server1:/var/lib/neo4j/logs
90-
- ./neo4j/conf/server1:/var/lib/neo4j/conf
91-
- ./neo4j/import/server1:/var/lib/neo4j/import
92-
- ./neo4j/metrics/server1:/var/lib/neo4j/metrics
93-
- ./neo4j/licenses/server1:/var/lib/neo4j/licenses
94-
- ./neo4j/ssl/server1:/var/lib/neo4j/ssl
71+
- "7687:7687"
72+
- "7473:7473"
73+
- "7474:7474"
9574
environment:
9675
<<: *common-core-env
76+
NEO4j_server_bolt_advertised_address: localhost:7687
77+
NEO4j_server_http_advertised_address: localhost:7474
9778

9879
server2:
9980
<<: *common-cluster
10081
hostname: server2
10182
ports:
102-
- "7689:7687"
103-
- "7476:7474"
83+
- "8687:7687"
84+
- "8473:7473"
85+
- "8474:7474"
10486
environment:
10587
<<: *common-core-env
106-
volumes:
107-
- ./neo4j/neo4j-cluster.conf:/conf/neo4j.conf
108-
- ./neo4j/data/server2:/var/lib/neo4j/data
109-
- ./neo4j/logs/server2:/var/lib/neo4j/logs
110-
- ./neo4j/conf/server2:/var/lib/neo4j/conf
111-
- ./neo4j/import/server2:/var/lib/neo4j/import
112-
- ./neo4j/metrics/server2:/var/lib/neo4j/metrics
113-
- ./neo4j/licenses/server2:/var/lib/neo4j/licenses
114-
- ./neo4j/ssl/server2:/var/lib/neo4j/ssl
88+
NEO4j_server_bolt_advertised_address: localhost:8687
89+
NEO4j_server_http_advertised_address: localhost:8474
11590

11691
server3:
11792
<<: *common-cluster
11893
hostname: server3
11994
ports:
120-
- "7690:7687"
121-
- "7477:7474"
95+
- "9474:7474"
96+
- "9473:7473"
97+
- "9687:7687"
12298
environment:
12399
<<: *common-core-env
124-
volumes:
125-
- ./neo4j/neo4j-cluster.conf:/conf/neo4j.conf
126-
- ./neo4j/data/server3:/var/lib/neo4j/data
127-
- ./neo4j/logs/server3:/var/lib/neo4j/logs
128-
- ./neo4j/conf/server3:/var/lib/neo4j/conf
129-
- ./neo4j/import/server3:/var/lib/neo4j/import
130-
- ./neo4j/metrics/server3:/var/lib/neo4j/metrics
131-
- ./neo4j/licenses/server3:/var/lib/neo4j/licenses
132-
- ./neo4j/ssl/server3:/var/lib/neo4j/ssl
100+
NEO4j_server_bolt_advertised_address: localhost:9687
101+
NEO4j_server_http_advertised_address: localhost:9474
133102

134103
server4:
135104
<<: *common-cluster
136105
hostname: server4
137106
ports:
138-
- "7691:7687"
139-
- "7478:7474"
107+
- "10474:7474"
108+
- "10473:7473"
109+
- "10687:7687"
140110
environment:
141111
<<: *common-cluster-env
142112
NEO4J_initial_server_mode__constraint: 'SECONDARY'
143-
volumes:
144-
- ./neo4j/neo4j-cluster.conf:/conf/neo4j.conf
145-
- ./neo4j/data/server4:/var/lib/neo4j/data
146-
- ./neo4j/logs/server4:/var/lib/neo4j/logs
147-
- ./neo4j/conf/server4:/var/lib/neo4j/conf
148-
- ./neo4j/import/server4:/var/lib/neo4j/import
149-
- ./neo4j/metrics/server4:/var/lib/neo4j/metrics
150-
- ./neo4j/licenses/server4:/var/lib/neo4j/licenses
151-
- ./neo4j/ssl/server4:/var/lib/neo4j/ssl
113+
NEO4j_server_bolt_advertised_address: localhost:10687
114+
NEO4j_server_http_advertised_address: localhost:10474

‎neo4j/conf/neo4j/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎neo4j/conf/server1/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎neo4j/conf/server2/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎neo4j/conf/server3/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎neo4j/conf/server4/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎neo4j/data/neo4j/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎neo4j/data/server1/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)