Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#5) Upgraded to PHP 7.3.0. #6

Merged
merged 3 commits into from
Dec 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=1.2.0
VERSION=1.3.0

all: clean
@mkdir phppro-dockerized_php-v$(VERSION)
Expand Down
7 changes: 6 additions & 1 deletion base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -17,17 +17,20 @@ 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 \
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 && \


Expand All @@ -43,6 +46,8 @@ 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!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 && \
Expand Down
4 changes: 2 additions & 2 deletions build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion dist/_common/bin/containers
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"

Expand Down
2 changes: 1 addition & 1 deletion dist/mariadb/docker/docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
web:
image: phpexperts/web:nginx-php7.2
image: phpexperts/web:nginx-php7.3
depends_on:
- db
links:
Expand Down
2 changes: 1 addition & 1 deletion dist/mariadb/docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dist/postgres/docker/docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
web:
image: phpexperts/web:nginx-php7.2
image: phpexperts/web:nginx-php7.3
depends_on:
- db
links:
Expand Down
2 changes: 1 addition & 1 deletion dist/postgres/docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion web-debug/supervisor/php-fpm.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[program:php-fpm]
command=php-fpm7.2
command=php-fpm7.3
numprocs=1
autostart=true
autorestart=true
Expand Down
2 changes: 1 addition & 1 deletion web/supervisor/php-fpm.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[program:php-fpm]
command=php-fpm7.2
command=php-fpm7.3
numprocs=1
autostart=true
autorestart=true
Expand Down