Update local testing to run in docker containers .

Author: Daniel Mellum

.circleci/php7/Dockerfile

@@ -21,4 +21,10 @@ RUN apk --no-cache add
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-ENTRYPOINT ["/entrypoint.sh"]
+WORKDIR /
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+
+ENTRYPOINT ["entrypoint.sh"]

.circleci/php7/entrypoint.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 export DEBIAN_FRONTEND=noninteractive
-
 bash <(cat /etc/os-release; echo 'echo ${VERSION/*, /}')
 php -v
-nginx -v
-
-echo "Entrypoint/Boot actions completed..."
+echo "Entrypoint/Boot actions completed..."

.circleci/php8/Dockerfile

@@ -19,6 +19,13 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
 
 RUN apk --no-cache add
 
-RUN curl -sS https://getcomposer.org/installer | php8 -- --install-dir=/usr/local/bin --filename=composer
+RUN ln -s /usr/bin/php8 /usr/bin/php
 
-ENTRYPOINT ["/entrypoint.sh"]
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+WORKDIR /
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["entrypoint.sh"]

.circleci/php8/entrypoint.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 export DEBIAN_FRONTEND=noninteractive
-
 bash <(cat /etc/os-release; echo 'echo ${VERSION/*, /}')
 php -v
-nginx -v
-
-echo "Entrypoint/Boot actions completed..."
+echo "Entrypoint/Boot actions completed..."

.env.testing

@@ -1,2 +1,8 @@
-DB_DATABASE=testing
-MDB_DATABASE=testing
+DB_CONNECTION=mysql
+DB_HOST=mariadb
+DB_PORT=3306
+DB_DATABASE=logtodb
+DB_USERNAME=root
+MDB_DATABASE=logtodb
+MDB_HOST=mongo
+MDB_PORT=27017

buildDockerImages.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+echo "Building PHP7 image..." &&
+cd .circleci/php7 && docker build . -t danielme/laravel-circleci-php7:latest &&
+echo "Building PHP8 image..." &&
+cd  ../../.circleci/php8 && docker build . -t danielme/laravel-circleci-php8:latest

docker-compose.yaml

@@ -1,22 +1,86 @@
 ---
 version: "2.4"
 services:
+
   mariadb:
-    image: mariadb:latest
-    container_name: mariadb_phpunit
-    network_mode: bridge
+    image: mariadb:10.5
+    container_name: laravel-log-to-db-mariadb
+    networks:
+      - laravel-log-to-db-testbench
     ports:
       - "3366:3306"
     environment:
-      - MYSQL_DATABASE=testing
-      - MYSQL_USER=testing
-      - MYSQL_ROOT_PASSWORD=norestforthetest
-      - MYSQL_PASSWORD=norestforthetest
+      MYSQL_DATABASE: 'logtodb'
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
 
   mongo:
-    image: mongo
-    container_name: mongodb_phpunit
-    restart: always
-    network_mode: bridge
+    image: mongo:latest
+    container_name: laravel-log-to-db-mongodb
+    networks:
+      - laravel-log-to-db-testbench
     ports:
       - "27888:27017"
+
+  php7:
+    image: danielme/laravel-circleci-php7:latest
+    container_name: laravel-log-to-db-php7_testbench
+    depends_on:
+      - "mariadb"
+      - "mongo"
+    networks:
+      - laravel-log-to-db-testbench
+    volumes:
+      - .:/var/testing
+    environment:
+      - DB_CONNECTION=mysql
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_DATABASE=logtodb
+      - DB_USERNAME=root
+      - MDB_DATABASE=logtodb
+      - MDB_HOST=mongo
+      - MDB_PORT=27017
+
+    #entrypoint: "tail -f /dev/null"
+
+    entrypoint: bash -c "
+      cd /var/testing &&
+      composer install --no-interaction &&
+      composer require jenssegers/mongodb --dev &&
+      dockerize -wait tcp://mariadb:3306 -timeout 1m &&
+      ./vendor/bin/testbench package:test
+      "
+
+  php8:
+    image: danielme/laravel-circleci-php8:latest
+    container_name: laravel-log-to-db-php8_testbench
+    depends_on:
+      - "mariadb"
+      - "mongo"
+    networks:
+      - laravel-log-to-db-testbench
+    volumes:
+      - .:/var/testing
+    environment:
+      - DB_CONNECTION=mysql
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_DATABASE=logtodb
+      - DB_USERNAME=root
+      - MDB_DATABASE=logtodb
+      - MDB_HOST=mongo
+      - MDB_PORT=27017
+
+    #entrypoint: "tail -f /dev/null"
+
+    entrypoint: bash -c "
+      cd /var/testing &&
+      composer install --no-interaction &&
+      composer require jenssegers/mongodb --dev &&
+      dockerize -wait tcp://mariadb:3306 -timeout 1m &&
+      ./vendor/bin/testbench package:test
+      "
+
+networks:
+  laravel-log-to-db-testbench:
+    driver: bridge

runLocalTestInDocker.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+docker-compose up -d mariadb mongo &&
+docker-compose up php7 &&
+docker-compose up php8 &&
+docker-compose down

testbench.yaml

@@ -1,11 +1,12 @@
 env:
-  - DB_HOST=0.0.0.0
-  - DB_PORT=3366
-  - DB_DATABASE=testing
-  - DB_USER=root
-  - DB_PASSWORD=norestforthetest
-  - MDB_DATABASE=testing
-  - MDB_PORT=27888
+  - DB_CONNECTION=mysql
+  - DB_HOST=mariadb
+  - DB_PORT=3306
+  - DB_DATABASE=logtodb
+  - DB_USERNAME=root
+  - MDB_DATABASE=logtodb
+  - MDB_HOST=mongo
+  - MDB_PORT=27017
 
 providers:
-  - danielme85\LaravelLogToDB\ServiceProvider
+  - danielme85\LaravelLogToDB\ServiceProvider

tests/LogToDbTest.php

@@ -15,9 +15,20 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->loadMigrationsFrom(__DIR__.'/../src/migrations');
-        $this->artisan('migrate', [
-            '--database' => 'mysql'
-        ]);
+    }
+
+    /**
+     * Define database migrations.
+     *
+     * @return void
+     */
+    protected function defineDatabaseMigrations()
+    {
+        $this->artisan('migrate', ['--database' => 'mysql'])->run();
+
+        //$this->beforeApplicationDestroyed(function () {
+        //    $this->artisan('migrate:rollback', ['--database' => 'testbench'])->run();
+        //});
     }
 
     /**
@@ -27,7 +38,7 @@ protected function setUp(): void
      *
      * @return void
      */
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $dotenv = Dotenv\Dotenv::createImmutable(__DIR__.'/../', '.env.testing');
         $dotenv->load();
@@ -39,7 +50,7 @@ protected function getEnvironmentSetUp($app)
                 'host' => env('DB_HOST', '127.0.0.1'),
                 'port' => env('DB_PORT', 3306),
                 'database' => env('DB_DATABASE', 'testing'),
-                'username' => env('DB_USER', 'root'),
+                'username' => env('DB_USERNAME', 'root'),
                 'password' => env('DB_PASSWORD', ''),
                 'charset' => 'utf8',
                 'collation' => 'utf8_unicode_ci',
@@ -236,7 +247,7 @@ public function testException()
         $this->expectException(DBLogException::class);
         throw new DBLogException('Dont log this');
     }
-    
+
     /**
      * Test exception when expected format is wrong.
      *