From 7797c1cef0f95fb51b89faf40522f8498e378082 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Tue, 1 Nov 2022 09:56:17 +0200
Subject: [PATCH 1/4] Update README.md

---
 README.md                  | 17 ++++++++++-------
 docker-compose.yml         |  7 +++++--
 example/docker-compose.yml | 26 ++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 example/docker-compose.yml

diff --git a/README.md b/README.md
index 130082d..938ea96 100644
--- a/README.md
+++ b/README.md
@@ -79,15 +79,18 @@ services:
             - default #if you're using networks between containers
     #Nginx server
     nginx-server:
-    image: nginx:alpine
-    container_name: nginx-server
-    restart: unless-stopped
-    ports:
+     image: jkaninda/nginx-fpm:alpine
+     container_name: nginx-server
+     restart: unless-stopped
+     ports:
       - 80:80
-    volumes:
+     volumes:
       - ./:/var/www/html
-      - ./default.conf:/etc/nginx/conf.d/default.conf
-    networks:
+     environment:
+       - DOCUMENT_ROOT=/var/www/html/public
+       - CLIENT_MAX_BODY_SIZE=20M
+       - PHP_FPM_HOST=php-fpm:9000 
+     networks:
       - default
 
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
index f687f1e..f05d772 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,13 +11,16 @@ services:
             - default #if you're using networks between containers
     #Nginx server
     nginx-server:
-     image: nginx:alpine
+     image: jkaninda/nginx-fpm:alpine
      container_name: nginx-server
      restart: unless-stopped
      ports:
       - 80:80
      volumes:
       - ./laravel:/var/www/html
-      - ./example/default.conf:/etc/nginx/conf.d/default.conf
+     environment:
+       - DOCUMENT_ROOT=/var/www/html/public
+       - CLIENT_MAX_BODY_SIZE=20M
+       - PHP_FPM_HOST=php-fpm:9000 
      networks:
       - default
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
new file mode 100644
index 0000000..e93af9d
--- /dev/null
+++ b/example/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3'
+services:
+    php-fpm:
+        image: jkaninda/laravel-php-fpm:8.1 
+        container_name: php-fpm
+        restart: unless-stopped     
+        volumes:
+        #Project root
+            - ./:/var/www/html
+        networks:
+            - default #if you're using networks between containers
+    #Nginx server
+    nginx-server:
+     image: jkaninda/nginx-fpm:alpine
+     container_name: nginx-server
+     restart: unless-stopped
+     ports:
+      - 80:80
+     volumes:
+      - ./:/var/www/html
+     environment:
+       - DOCUMENT_ROOT=/var/www/html/public
+       - CLIENT_MAX_BODY_SIZE=20M
+       - PHP_FPM_HOST=php-fpm:9000 
+     networks:
+      - default

From 33fddef79d584795ba6181f74299084fe1f60896 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Mon, 7 Nov 2022 16:56:52 +0200
Subject: [PATCH 2/4] Update php version

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 09e41fc..eac7742 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM php:8.1.10-fpm
+FROM php:8.1.11-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}
 ENV LARAVEL_PROCS_NUMBER=1
-ENV NODE_VERSION=16.x
+ENV NODE_VERSION=17.x
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \

From 8e41d2b7b99eb02e443d37ec629a6c4c6e221ada Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Sun, 4 Dec 2022 19:57:12 +0200
Subject: [PATCH 3/4] Update SecurityContext

---
 entrypoint.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 4315990..e29a1a2 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -17,14 +17,14 @@ if [ -f /var/www/html/artisan ]; then
     cat > "$TASK" <<EOF
     [supervisord]
     nodaemon=true
-    user=root
+    user=www-data
     [program:Laravel-scheduler]
     process_name=%(program_name)s_%(process_num)02d
     command=/bin/sh -c "while [ true ]; do (php /var/www/html/artisan schedule:run --verbose --no-interaction &); sleep 60; done"
     autostart=true
     autorestart=true
     numprocs=1
-    user=root
+    user=www-data
     stdout_logfile=/var/log/laravel_scheduler.out.log
     redirect_stderr=true
     
@@ -34,7 +34,7 @@ if [ -f /var/www/html/artisan ]; then
     autostart=true
     autorestart=true
     numprocs=$LARAVEL_PROCS_NUMBER
-    user=root
+    user=www-data
     redirect_stderr=true
     stdout_logfile=/var/log/laravel_worker.log
 EOF

From 492ac5bdff39ad1b7937bc863274def3580deaca Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Sun, 4 Dec 2022 20:03:14 +0200
Subject: [PATCH 4/4] Update SecurityContext

---
 .github/workflows/build.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4dd7060..eb28434 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,14 +1,9 @@
-name: ci
+name: Docker image build and Push Image to registry
 
 on:
   push:
     branches:
       - '**'
-  pull_request:
-    types:
-      - closed
-    branches:
-      - '**'
 
 env:
   #BRANCH_NAME: ${{ github.head_ref || github.ref_name }}