further refinement of the docker files

Author: transistive

Jenkinsfile

@@ -22,14 +22,29 @@ pipeline {
         }
         stage('Test') {
             steps {
+                sh 'docker-compose -f docker/docker-compose-4.2.yml down --volumes'
+                sh 'docker-compose -f docker/docker-compose-4.2.yml up -d --force-recreate'
                 sh 'docker-compose -f docker/docker-compose-4.2.yml run client php vendor/bin/phpunit'
                 sh 'docker-compose -f docker/docker-compose-4.2.yml down'
+
+
+                sh 'docker-compose -f docker/docker-compose-4.1.yml down --volumes'
+                sh 'docker-compose -f docker/docker-compose-4.1.yml up -d --force-recreate'
                 sh 'docker-compose -f docker/docker-compose-4.1.yml run client php vendor/bin/phpunit'
                 sh 'docker-compose -f docker/docker-compose-4.1.yml down'
+
+
+                sh 'docker-compose -f docker/docker-compose-4.0.yml down --volumes'
+                sh 'docker-compose -f docker/docker-compose-4.0.yml up -d --force-recreate'
                 sh 'docker-compose -f docker/docker-compose-4.0.yml run client php vendor/bin/phpunit'
                 sh 'docker-compose -f docker/docker-compose-4.0.yml down'
+
+
+                sh 'docker-compose -f docker/docker-compose-3.5.yml down --volumes'
+                sh 'docker-compose -f docker/docker-compose-3.5.yml up -d --force-recreate'
                 sh 'docker-compose -f docker/docker-compose-3.5.yml run client php vendor/bin/phpunit'
                 sh 'docker-compose -f docker/docker-compose-3.5.yml down'
+
 //                 sh 'docker-compose -f docker/docker-compose-2.3.yml run client php vendor/bin/phpunit'
                 sh 'docker-compose -f docker/docker-compose-php-7.4.yml run client php vendor/bin/phpunit'
                 sh 'docker-compose -f docker/docker-compose-php-7.4.yml down'

docker-compose.yml

@@ -22,7 +22,7 @@ services:
     neo4j:
         networks:
             - neo4j
-        image: neo4j:3.5
+        image: neo4j:4.2
         ports:
             - "7474:7474"
             - "7687:7687"

docker/Dockerfile-php-8.0

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y \
 ARG WITH_XDEBUG=false
 
 RUN if [ $WITH_XDEBUG = "true" ] ; then \
-        pecl install xdebug-3; \
+        pecl install xdebug; \
         docker-php-ext-enable xdebug; \
 fi;
 

docker/docker-compose-2.3.yml

@@ -9,6 +9,8 @@ services:
         build:
             context: ../
             dockerfile: docker/Dockerfile-php-8.0
+            args:
+                - WITH_XDEBUG=true
         networks:
             - neo4j
         depends_on:

docker/docker-compose-3.5.yml

@@ -9,6 +9,8 @@ services:
         build:
             context: ../
             dockerfile: docker/Dockerfile-php-8.0
+            args:
+                - WITH_XDEBUG=true
         networks:
             - neo4j
         depends_on:

docker/docker-compose-4.0.yml

@@ -9,10 +9,14 @@ services:
         build:
             context: ../
             dockerfile: docker/Dockerfile-php-8.0
+            args:
+                - WITH_XDEBUG=true
         networks:
             - neo4j
         depends_on:
-            -   neo4j
+            - neo4j
+        volumes:
+            - ../:/opt/project
     neo4j:
         networks:
             - neo4j

docker/docker-compose-4.1.yml

@@ -9,10 +9,14 @@ services:
         build:
             context: ../
             dockerfile: docker/Dockerfile-php-8.0
+            args:
+                - WITH_XDEBUG=true
         networks:
             - neo4j
         depends_on:
-            -   neo4j
+            - neo4j
+        volumes:
+            - ../:/opt/project
     neo4j:
         networks:
             - neo4j

docker/docker-compose-4.2.yml

@@ -9,10 +9,14 @@ services:
         build:
             context: ../
             dockerfile: docker/Dockerfile-php-8.0
+            args:
+                - WITH_XDEBUG=true
         networks:
             - neo4j
         depends_on:
-            -   neo4j
+            - neo4j
+        volumes:
+            - ../:/opt/project
     neo4j:
         networks:
             - neo4j

docker/docker-compose-php-7.4.yml

@@ -9,10 +9,14 @@ services:
         build:
             context: ../
             dockerfile: docker/Dockerfile-php-7.4
+            args:
+                - WITH_XDEBUG=true
         networks:
             - neo4j
         depends_on:
-            -   neo4j
+            - neo4j
+        volumes:
+            - ../:/opt/project
     neo4j:
         networks:
             - neo4j

phpunit-bootstrap.php

@@ -12,7 +12,6 @@
  */
 
 use Laudis\Neo4j\ClientBuilder;
-use Laudis\Neo4j\Exception\Neo4jException;
 
 include __DIR__.'/vendor/autoload.php';
 
@@ -27,6 +26,7 @@
 
         return;
     } catch (Throwable $e) {
+        error_log($e->getMessage()."\n");
         --$retriesLeft;
         sleep(5);
     }