update the testing enviroment

Daniel Mellum · Daniel Mellum · commit e4dd0c0648c8 · 2022-12-01T14:25:04.000-05:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/php8/entrypoint.sh b/.circleci/php8/entrypoint.sh
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,25 @@
+name: TestInDocker
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  docker:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Start containers and Run tests
+        run: docker-compose -f "docker-compose.yml" up -d --build
+
+      - name: Stop containers
+        if: always()
+        run: docker-compose -f "docker-compose.yml" down
diff --git a/buildDockerImages.sh b/buildDockerImages.sh
@@ -1,5 +1,3 @@
 #!/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
+cd  ./docker/php8 && docker build . -t danielme/laravel-php8:latest
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
     image: mariadb:10.5
     container_name: laravel-log-to-db-mariadb
     networks:
-      - laravel-log-to-db-testbench
+      - laravel-log-to-db-testing
     ports:
       - "3366:3306"
     environment:
@@ -17,47 +17,20 @@ services:
     image: mongo:latest
     container_name: laravel-log-to-db-mongodb
     networks:
-      - laravel-log-to-db-testbench
+      - laravel-log-to-db-testing
     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 &&
-      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
+    container_name: laravel-log-to-db-php8
+    build:
+      context: ./docker/php8/
+      dockerfile: Dockerfile
     depends_on:
       - "mariadb"
       - "mongo"
     networks:
-      - laravel-log-to-db-testbench
+      - laravel-log-to-db-testing
     volumes:
       - .:/var/testing
     environment:
@@ -70,8 +43,6 @@ services:
       - MDB_HOST=mongo
       - MDB_PORT=27017
 
-    #entrypoint: "tail -f /dev/null"
-
     entrypoint: bash -c "
       cd /var/testing &&
       composer install --no-interaction &&
@@ -80,5 +51,5 @@ services:
       "
 
 networks:
-  laravel-log-to-db-testbench:
+  laravel-log-to-db-testing:
     driver: bridge
diff --git a/docker/php8/Dockerfile b/docker/php8/Dockerfile
@@ -1,30 +1,32 @@
-FROM alpine:latest
+FROM ubuntu:jammy
 
 LABEL Maintainer="Daniel Mellum <mellum@gmail.com>" \
       Description="A simple docker image used in phpunit testing Laravel apps."
 
 ENV DOCKERIZE_VERSION v0.6.1
+ENV TZ=America/New_York
+ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apk --no-cache add php7 php7-common php7-fpm php7-zip php7-json php7-openssl php7-curl \
-    php7-zlib php7-xml php7-phar php7-intl php7-dom php7-xmlreader php7-xmlwriter php7-ctype \
-    php7-mbstring php7-gd php7-session php7-pdo php7-pdo_mysql php7-tokenizer php7-posix \
-    php7-fileinfo php7-opcache php7-cli php7-mcrypt php7-pcntl php7-iconv php7-simplexml php7-mongodb \
-    curl git openssl openssh-client mysql-client bash
+WORKDIR /
+
+RUN apt update && apt upgrade -y
+RUN apt install -y curl git openssl openssh-client mysql-client bash libzip-dev zip wget \
+    php8.1 php8.1-dev php8.1-mysql php8.1-mongodb php8.1-curl php8.1-mbstring
+
+RUN pecl install pcov
+RUN pecl install mongodb
+
+#RUN mkdir -p /etc/php81/mods-available && echo "extension=mongodb.so" >> /etc/php81/mods-available/mongodb.ini
 
-RUN apk add php7-pecl-pcov --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
+RUN apt install wget -y
 
 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
-RUN apk --no-cache add
-
 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"]
+ENTRYPOINT ["entrypoint.sh"]
diff --git a/docker/php8/entrypoint.sh b/docker/php8/entrypoint.sh
@@ -2,4 +2,4 @@
 export DEBIAN_FRONTEND=noninteractive
 bash <(cat /etc/os-release; echo 'echo ${VERSION/*, /}')
 php -v
-echo "Entrypoint/Boot actions completed..."
+echo "Entrypoint/Boot actions completed..."
diff --git a/runLocalTestInDocker.sh b/runLocalTestInDocker.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 docker-compose up -d mariadb mongo &&
-docker-compose up php7 &&
-docker-compose up php8 &&
+docker-compose up php8 --build php8 &&
 docker-compose down
diff --git a/src/LogToDbCustomLoggingHandler.php b/src/LogToDbCustomLoggingHandler.php
@@ -25,7 +25,7 @@ class LogToDbCustomLoggingHandler extends AbstractProcessingHandler
     /**
      * LogToDbHandler constructor.
      *
-     * @param array $config Logging configuration from logging.php
+     * @param array $config Logging configuration from logging.php8
      * @param array $processors collection of log processors
      * @param bool $bubble Whether the messages that are handled can bubble up the stack or not
      */
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -37,7 +37,7 @@ function config_path($path = '')
         //Merge config first, then keep a publish option
         $this->mergeConfigFrom(__DIR__.'/config/logtodb.php', 'logtodb');
         $this->publishes([
-            __DIR__.'/config/logtodb.php' => config_path('logtodb.php'),
+            __DIR__.'/config/logtodb.php' => config_path('logtodb.php8'),
         ], 'config');
 
         //Publish the migration
diff --git a/src/config/logtodb.php b/src/config/logtodb.php
@@ -5,7 +5,7 @@
     |--------------------------------------------------------------------------
     |
     |   These settings are ONLY USED if they are not specified per channel
-    |   in the config/logging.php file.
+    |   in the config/logging.php8 file.
     |
     */
 return [
@@ -15,11 +15,11 @@
     |--------------------------------------------------------------------------
     |
     | Set the default database connection to use. This is only used if no connection
-    | is specified in config/logging.php. Matches connections in the config/database.php.
+    | is specified in config/logging.php8. Matches connections in the config/database.php8.
     | The default is: 'default', this will use whatever is default in the Laravel DB
     | config file. To use a different or separate connection set the connection name here.
-    | Ex: 'connection' => 'mysql' wil use the connection 'mysql' in database.php.
-    | Ex: 'connection' => 'mongodb' wil use the connection 'mongodb' in database.php*
+    | Ex: 'connection' => 'mysql' wil use the connection 'mysql' in database.php8.
+    | Ex: 'connection' => 'mongodb' wil use the connection 'mongodb' in database.php8*
     |
     | Supported connections should be same as Laravel since the Laravel DB/Eloquent
     | Supported DB engines as of this writing: [MySQL] [PostgreSQL] [SQLite] [SQL Server]
@@ -89,7 +89,7 @@
     |
     | If you are working with multiple queue connections, you may specify which
     | connection to push a job to.
-    | This relates yto your queue settings in the config/queue.php file.
+    | This relates yto your queue settings in the config/queue.php8 file.
     | Leave blank to use the default connection.
     |
     */
diff --git a/tests/LogToDbTest.php b/tests/LogToDbTest.php
@@ -118,7 +118,7 @@ protected function defineEnvironment($app)
      * Get package providers.  At a minimum this is the package being tested, but also
      * would include packages upon which our package depends, e.g. Cartalyst/Sentry
      * In a normal app environment these would be added to the 'providers' array in
-     * the config/app.php file.
+     * the config/app.php8 file.
      *
      * @param \Illuminate\Foundation\Application $app
      *
@@ -172,17 +172,6 @@ public function testLogLevels()
         $this->assertCount(8, $logReaderSpecific);
     }
 
-    /**
-     *
-     * @group events
-     * @throws Exception
-     */
-    public function testMessageLoggedEvent()
-    {
-        $this->expectsEvents([\Illuminate\Log\Events\MessageLogged::class]);
-        Log::debug("This is to trigger a log event.");
-    }
-
     /**
      * @group context
      */

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class LogToDbCustomLoggingHandler extends AbstractProcessingHandler`
`25`	`25`	`/**`
`26`	`26`	`* LogToDbHandler constructor.`
`27`	`27`	`*`
`28`		`- * @param array $config Logging configuration from logging.php`
	`28`	`+ * @param array $config Logging configuration from logging.php8`
`29`	`29`	`* @param array $processors collection of log processors`
`30`	`30`	`* @param bool $bubble Whether the messages that are handled can bubble up the stack or not`
`31`	`31`	`*/`