Merge pull request #1 from garutilorenzo/refactoring

Refactoring

.docker-compose.yml-ci

@@ -3,18 +3,12 @@ services:
 
   laravel:
     container_name: laravel
-    image: localbuild/laravel-docker-ci:latest
-    build:
-     context: laravel/
-     args:
-       DOCKER_IMAGE_VERSION: 8.0-fpm 
-       PDO: pdo_mysql 
-       DB: mysql
+    image: localbuild/laravel-docker:php80
     environment:
-      - MYSQL_USER=app
-      - MYSQL_PASSWORD=dev
-      - MYSQL_DATABASE=laravel
-      - LARAVEL_DB_HOST=mysql
+      - MYSQL_USER=${LARAVEL_DB_USER:-app}
+      - MYSQL_PASSWORD=${LARAVEL_DB_PASSWORD:-password}
+      - MYSQL_DATABASE=${LARAVEL_DB_NAME:-laravel}
+      - LARAVEL_DB_HOST=${LARAVEL_DB_HOST:-mysql}
       - FORCE_MIGRATE=force
     command: [ "php", "artisan", "serve", "--host=0.0.0.0", "--port=3000" ]
     ports: 

.dockerignore

@@ -0,0 +1,2 @@
+*.tar.gz
+laravel-project/

.env

@@ -1,21 +1,21 @@
 # laravel 
 LARAVEL_DB_NAME=laravel
 LARAVEL_DB_HOST=mysql
-LARAVEL_DB_USER=root
+LARAVEL_DB_USER=app
 LARAVEL_DB_PASSWORD=password
 
 # mariadb 
 MARIADB_VERSION=latest
 MYSQL_ROOT_PASSWORD=laravelAdmin
 MYSQL_USER=app
-MYSQL_PASSWORD=dev
+MYSQL_PASSWORD=password
 MYSQL_DATABASE=laravel
 
 # nginx
 NGINX_VERSION=latest
 
 # volumes on host
-NGINX_CONF_DIR=./config/nginx
+NGINX_TEMPLATE_DIR=./config
 LARAVEL_DATA_DIR=./laravel-project
 SSL_CERTS_DIR=./certs
 SSL_CERTS_DATA_DIR=./certs-data

.github/workflows/ci.yml

@@ -3,10 +3,20 @@ name: Laravel CI
 on:
   push:
     branches:
-    - master
+      - master
+    paths:
+      - 'laravel/**'
+      - 'ubuntu/**'
+      - 'php-fpm/**'
+      - 'alpine/**'
   pull_request:
     branches:
-    - master
+      - master
+    paths:
+      - 'laravel/**'
+      - 'ubuntu/**'
+      - 'php-fpm/**'
+      - 'alpine/**'
 
 jobs:
 
@@ -15,9 +25,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build the Docker image
-      run: docker-compose -f .docker-compose.yml-ci build --pull --no-cache
+      run: docker-compose --env-file build-env-files/php-fpm/8/.env-mysql -f build-phpfpm.yml build --pull
     - name: Bringup the environment
       run: docker-compose -f .docker-compose.yml-ci --env-file .env up -d
     - name: Sleep for 30 seconds
@@ -31,7 +41,7 @@ jobs:
     - uses: anchore/scan-action@v2
       id: scan
       with:
-        image: "localbuild/laravel-docker-ci:latest"
+        image: "localbuild/laravel-docker:php80"
         acs-report-enable: true
     - name: upload Anchore scan SARIF report
       uses: github/codeql-action/upload-sarif@v1

.gitignore

@@ -1 +1,2 @@
 sql/
+laravel-project/