From 9e3fb80187ff19064743d61381ebb98cc2454259 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Fri, 28 Oct 2022 16:02:54 +0200 Subject: [PATCH 1/9] Update php version to 8.2 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09e41fc..e7d4af5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.10-fpm +FROM php:8.2.0RC5-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 @@ -24,9 +24,9 @@ RUN apt-get update && apt-get install -y \ nano \ cron -RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - +#RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - # Install Node -RUN apt-get install -y nodejs +#RUN apt-get install -y nodejs # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka From 65bd3d098effe1e7f81d98920ac800d5a40f845a Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Sun, 30 Oct 2022 05:42:19 +0200 Subject: [PATCH 2/9] Update php version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e7d4af5..2aeb97c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.0RC5-fpm +FROM php:8.1-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 From 7797c1cef0f95fb51b89faf40522f8498e378082 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 1 Nov 2022 09:56:17 +0200 Subject: [PATCH 3/9] 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 e76fed931e7f11cd3e6e81523bb8c8dc948a7f13 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 1 Nov 2022 10:10:29 +0200 Subject: [PATCH 4/9] Update Node version --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2aeb97c..f5e315a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.1-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 \ @@ -24,9 +24,9 @@ RUN apt-get update && apt-get install -y \ nano \ cron -#RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - +RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - # Install Node -#RUN apt-get install -y nodejs +RUN apt-get install -y nodejs # Clear cache RUN apt-get clean && rm -rf /var/lib/apt/lists/* # Install Kafka From a8e38b6618d70f8f641b35fc762f95687bdf8d2d Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 1 Nov 2022 10:15:27 +0200 Subject: [PATCH 5/9] Update Node version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f5e315a..664c2e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:8.1-fpm ARG WORKDIR=/var/www/html ENV DOCUMENT_ROOT=${WORKDIR} ENV LARAVEL_PROCS_NUMBER=1 -ENV NODE_VERSION=17.x +ENV NODE_VERSION=16.x # Install system dependencies RUN apt-get update && apt-get install -y \ git \ From c137b5b82465532462b7b923cb3d3fc11d577ad1 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 1 Nov 2022 10:21:20 +0200 Subject: [PATCH 6/9] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3753eba..7292df0 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ # Laravel PHP-FPM Docker image > 🐳 Full Docker image for a PHP-FPM container created to run Laravel or any php based applications. +PHP Microservices ready Docker container. - [Docker Hub](https://hub.docker.com/r/jkaninda/laravel-php-fpm) - [Github](https://github.com/jkaninda/laravel-php-fpm) From ce77b592c7c32591abf6a4d9bc766ee3bc27ab4a Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 1 Nov 2022 10:21:42 +0200 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7292df0..8fe8b10 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ # Laravel PHP-FPM Docker image > 🐳 Full Docker image for a PHP-FPM container created to run Laravel or any php based applications. -PHP Microservices ready Docker container. +> PHP Microservices ready Docker container. - [Docker Hub](https://hub.docker.com/r/jkaninda/laravel-php-fpm) - [Github](https://github.com/jkaninda/laravel-php-fpm) From 7268b777b8e1abca76a3ff7b2764305906fd9712 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Tue, 1 Nov 2022 10:21:59 +0200 Subject: [PATCH 8/9] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8fe8b10..787dc0d 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ # Laravel PHP-FPM Docker image > 🐳 Full Docker image for a PHP-FPM container created to run Laravel or any php based applications. + > PHP Microservices ready Docker container. - [Docker Hub](https://hub.docker.com/r/jkaninda/laravel-php-fpm) From 33fddef79d584795ba6181f74299084fe1f60896 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Mon, 7 Nov 2022 16:56:52 +0200 Subject: [PATCH 9/9] 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 \