Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/workflows/testkit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,5 @@ jobs:
- name: Run integration tests
run: |
docker compose up -d --remove-orphans --wait --no-build \
server1 \
server2 \
server3 \
server4 \
testkit_backend
docker compose run --rm testkit ./testkit.sh
docker compose up -d --remove-orphans --wait --no-build testkit_backend neo4j
docker compose up testkit
3 changes: 0 additions & 3 deletions Dockerfile.neo4j-okta

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"psr/http-factory": "^1.0",
"psr/http-client": "^1.0",
"php-http/message": "^1.0",
"stefanak-michal/bolt": "^7.2.4",
"stefanak-michal/bolt": "^7.1.4",
"symfony/polyfill-php80": "^1.2",
"psr/simple-cache": ">=2.0",
"ext-json": "*",
Expand Down
10 changes: 6 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ services:
- .env
neo4j:
<<: *common
image: neo4j:5.23-enterprise
image: neo4j:5-enterprise
hostname: neo4j
networks:
- neo4j
Expand All @@ -62,7 +62,7 @@ services:
- "11474:7474"
environment:
<<: *common-env
NEO4J_ACCEPT_LICENSE_AGREEMENT: 'yes' # Also add this
NEO4J_ACCEPT_LICENSE_AGREEMENT: 'yes'
NEO4J_server_bolt_advertised__address: neo4j:7687
NEO4J_server_http_advertised__address: neo4j:7474

Expand Down Expand Up @@ -119,6 +119,7 @@ services:

testkit:
image: python:3.13
command: ./testkit.sh
volumes:
- .:/opt/project
working_dir: /opt/project/testkit-backend
Expand All @@ -131,6 +132,9 @@ services:
TEST_DRIVER_NAME: php
TEST_DRIVER_REPO: /opt/project
TEST_BACKEND_HOST: testkit_backend
TEST_STUB_HOST: testkit
depends_on:
- testkit_backend

testkit_backend:
<<: *common-php
Expand All @@ -141,7 +145,5 @@ services:
- neo4j
extra_hosts:
- "host.docker.internal:host-gateway"
depends_on:
- neo4j
ports:
- "9876:9876"
Loading