From 7027eb5367fee18c07b0e62608c45ea1fc055eb7 Mon Sep 17 00:00:00 2001 From: "Theodore R. Smith" Date: Tue, 2 Oct 2018 20:50:45 -0500 Subject: [PATCH 1/3] Fixed a long-standing bug. --- dist/_common/bin/containers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/_common/bin/containers b/dist/_common/bin/containers index 5156e07..38c4a91 100755 --- a/dist/_common/bin/containers +++ b/dist/_common/bin/containers @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" From e30349f470ef52e21fe6b7240d6faea396b1c63a Mon Sep 17 00:00:00 2001 From: "Theodore R. Smith" Date: Tue, 2 Oct 2018 20:51:51 -0500 Subject: [PATCH 2/3] Added the gmp extension. --- base/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/Dockerfile b/base/Dockerfile index 51b3df9..67c3ee8 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -23,11 +23,13 @@ RUN apt-get update && \ php${PHP_VERSION}-curl \ php${PHP_VERSION}-dom \ php${PHP_VERSION}-gd \ + php${PHP_VERSION}-gmp \ php${PHP_VERSION}-mbstring \ php${PHP_VERSION}-mysql \ php${PHP_VERSION}-pgsql \ php${PHP_VERSION}-sqlite3 \ php${PHP_VERSION}-opcache \ + php${PHP_VERSION}-memcached \ php${PHP_VERSION}-zip && \ @@ -43,6 +45,7 @@ RUN apt-get update && \ ## Configure PHP-FPM sed -i "s!display_startup_errors = Off!display_startup_errors = On!g" /etc/php/${PHP_VERSION}/fpm/php.ini && \ sed -i "s!;error_log = php_errors.log!error_log = /proc/self/fd/2!g" /etc/php/${PHP_VERSION}/fpm/php.ini && \ + sed -i "s!max_execution_time = 30!max_execution_time = 600!g" /etc/php/${PHP_VERSION}/fpm/php.ini && \ sed -i "s!;daemonize = yes!daemonize = no!g" /etc/php/${PHP_VERSION}/fpm/php-fpm.conf && \ sed -i "s!error_log = /var/log/php${PHP_VERSION}-fpm.log!error_log = /proc/self/fd/2!g" /etc/php/${PHP_VERSION}/fpm/php-fpm.conf && \ From e49f52f7b367a001556057f6ab05a1a6615d3691 Mon Sep 17 00:00:00 2001 From: "Theodore R. Smith" Date: Tue, 18 Dec 2018 08:31:08 -0600 Subject: [PATCH 3/3] (#5) Upgraded to PHP 7.3.0. --- FAQ.md | 4 ++-- Makefile | 2 +- base/Dockerfile | 4 +++- build-images.sh | 4 ++-- dist/mariadb/docker/docker-compose.base.yml | 2 +- dist/mariadb/docker/docker-compose.dev.yml | 2 +- dist/postgres/docker/docker-compose.base.yml | 2 +- dist/postgres/docker/docker-compose.dev.yml | 2 +- web-debug/supervisor/php-fpm.conf | 2 +- web/supervisor/php-fpm.conf | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/FAQ.md b/FAQ.md index 2d22546..222bfb4 100644 --- a/FAQ.md +++ b/FAQ.md @@ -2,7 +2,7 @@ ### What is included in this project? - * PHP v7.2.2, built on 1 Feb 2018 + * PHP v7.3.0, built on 17 December 2018 * Nginx v1.10.3 * Redis v3.2.6 * PostgreSQL v9.6.6 @@ -34,7 +34,7 @@ With every other dockerized PHP platformer I am aware of, you are on your own when it comes to setting up these client utilities. -### What does this provide that say Laravel Homestead does not? +### What does this provide that Laravel Homestead does not? Laravel Homestead uses Vagrant and full virtual machines. This is *way* overkill when you want a dockerized PHP app running on native Linux dev boxes and servers, like I diff --git a/Makefile b/Makefile index 8a82236..75045db 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=1.2.0 +VERSION=1.3.0 all: clean @mkdir phppro-dockerized_php-v$(VERSION) diff --git a/base/Dockerfile b/base/Dockerfile index 67c3ee8..a53a762 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,7 +1,7 @@ # phpexperts/php:7 FROM ubuntu:xenial -ENV PHP_VERSION 7.2 +ENV PHP_VERSION 7.3 # Fix add-apt-repository is broken with non-UTF-8 locales, see https://github.com/oerdnj/deb.sury.org/issues/56 ENV LC_ALL C.UTF-8 @@ -17,6 +17,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ curl \ php${PHP_VERSION}-cli \ + vim inetutils-ping \ php${PHP_VERSION}-fpm && \ apt-get install -y --no-install-recommends \ php${PHP_VERSION}-bcmath \ @@ -46,6 +47,7 @@ RUN apt-get update && \ sed -i "s!display_startup_errors = Off!display_startup_errors = On!g" /etc/php/${PHP_VERSION}/fpm/php.ini && \ sed -i "s!;error_log = php_errors.log!error_log = /proc/self/fd/2!g" /etc/php/${PHP_VERSION}/fpm/php.ini && \ sed -i "s!max_execution_time = 30!max_execution_time = 600!g" /etc/php/${PHP_VERSION}/fpm/php.ini && \ + sed -i "s!session.gc_probability = 0!session.gc_probability = 1!g" /etc/php/${PHP_VERSION}/fpm/php.ini && \ sed -i "s!;daemonize = yes!daemonize = no!g" /etc/php/${PHP_VERSION}/fpm/php-fpm.conf && \ sed -i "s!error_log = /var/log/php${PHP_VERSION}-fpm.log!error_log = /proc/self/fd/2!g" /etc/php/${PHP_VERSION}/fpm/php-fpm.conf && \ diff --git a/build-images.sh b/build-images.sh index 193d48a..530ee08 100755 --- a/build-images.sh +++ b/build-images.sh @@ -3,5 +3,5 @@ docker build base --tag="phpexperts/php:7" docker build laravel --tag="phpexperts/php:7-laravel" docker build laravel-debug --tag="phpexperts/php:7-laravel-debug" -docker build web --tag="phpexperts/web:nginx-php7.2" -docker build web-debug --tag="phpexperts/web:nginx-php7.2-debug" +docker build web --tag="phpexperts/web:nginx-php7.3" +docker build web-debug --tag="phpexperts/web:nginx-php7.3-debug" diff --git a/dist/mariadb/docker/docker-compose.base.yml b/dist/mariadb/docker/docker-compose.base.yml index 16abe09..95d1c24 100644 --- a/dist/mariadb/docker/docker-compose.base.yml +++ b/dist/mariadb/docker/docker-compose.base.yml @@ -2,7 +2,7 @@ version: '2' services: web: - image: phpexperts/web:nginx-php7.2 + image: phpexperts/web:nginx-php7.3 depends_on: - db links: diff --git a/dist/mariadb/docker/docker-compose.dev.yml b/dist/mariadb/docker/docker-compose.dev.yml index 3e19755..6d3fbb6 100644 --- a/dist/mariadb/docker/docker-compose.dev.yml +++ b/dist/mariadb/docker/docker-compose.dev.yml @@ -2,7 +2,7 @@ version: '2' services: web: - image: phpexperts/web:nginx-php7.2-debug + image: phpexperts/web:nginx-php7.3-debug ports: - 80:80 diff --git a/dist/postgres/docker/docker-compose.base.yml b/dist/postgres/docker/docker-compose.base.yml index f971f86..d97d214 100644 --- a/dist/postgres/docker/docker-compose.base.yml +++ b/dist/postgres/docker/docker-compose.base.yml @@ -2,7 +2,7 @@ version: '2' services: web: - image: phpexperts/web:nginx-php7.2 + image: phpexperts/web:nginx-php7.3 depends_on: - db links: diff --git a/dist/postgres/docker/docker-compose.dev.yml b/dist/postgres/docker/docker-compose.dev.yml index ed7c597..7dde686 100644 --- a/dist/postgres/docker/docker-compose.dev.yml +++ b/dist/postgres/docker/docker-compose.dev.yml @@ -2,7 +2,7 @@ version: '2' services: web: - image: phpexperts/web:nginx-php7.2-debug + image: phpexperts/web:nginx-php7.3-debug ports: - 80:80 diff --git a/web-debug/supervisor/php-fpm.conf b/web-debug/supervisor/php-fpm.conf index 14f0207..be8c805 100644 --- a/web-debug/supervisor/php-fpm.conf +++ b/web-debug/supervisor/php-fpm.conf @@ -1,5 +1,5 @@ [program:php-fpm] -command=php-fpm7.2 +command=php-fpm7.3 numprocs=1 autostart=true autorestart=true diff --git a/web/supervisor/php-fpm.conf b/web/supervisor/php-fpm.conf index 14f0207..be8c805 100644 --- a/web/supervisor/php-fpm.conf +++ b/web/supervisor/php-fpm.conf @@ -1,5 +1,5 @@ [program:php-fpm] -command=php-fpm7.2 +command=php-fpm7.3 numprocs=1 autostart=true autorestart=true