From 0bce5d90629aee03cfb8f24122e8b4eaf9dfd7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fali=C3=A8s?= Date: Wed, 25 Sep 2019 22:43:42 +0200 Subject: [PATCH 1/6] Update ReadMe --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ff3ea5a..07d94d8 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ The utlisation outside this project is naturally possible. Seven PHP versions are available through image's tags: +- 5.6 FPM - 7.0 FPM - 7.1 FPM - 7.2 FPM From c3de00c483b8a99891b6aa35e1fbe6d0e2761e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fali=C3=A8s?= Date: Thu, 26 Sep 2019 20:53:16 +0200 Subject: [PATCH 2/6] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 07d94d8..dde5e0a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The utlisation outside this project is naturally possible. ## Images -Seven PHP versions are available through image's tags: +Nine PHP versions are available through image's tags: - 5.6 FPM - 7.0 FPM From 486297bf050717913132db7c37620bc6b01a64d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fali=C3=A8s?= Date: Sun, 29 Dec 2019 15:56:01 +0100 Subject: [PATCH 3/6] Add PHP 7.4 support --- .travis.yml | 14 +++--- CHANGELOG.md | 7 +++ Dockerfile | 65 ++++++++++++++++++++++++---- README.md | 2 + test/{7.3 => 7.4}/docker-compose.yml | 2 +- test/{7.3 => 7.4}/nginx/Dockerfile | 0 test/{7.3 => 7.4}/nginx/nginx.conf | 0 test/{7.3 => 7.4}/nginx/www.conf | 0 8 files changed, 73 insertions(+), 17 deletions(-) rename test/{7.3 => 7.4}/docker-compose.yml (89%) rename test/{7.3 => 7.4}/nginx/Dockerfile (100%) rename test/{7.3 => 7.4}/nginx/nginx.conf (100%) rename test/{7.3 => 7.4}/nginx/www.conf (100%) diff --git a/.travis.yml b/.travis.yml index 5cff83e..172c0a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,13 @@ before_install: - chmod +x /usr/local/bin/docker-compose - docker --version - - docker build -q -t vfac/envdevphpbase:7.3-fpm . - - docker run --name php7.3 -d -v $PWD:/var/www/html vfac/envdevphpbase:7.3-fpm - - docker-compose -f test/7.3/docker-compose.yml up -d + - docker build -q -t vfac/envdevphpbase:7.4-fpm . + - docker run --name php7.4 -d -v $PWD:/var/www/html vfac/envdevphpbase:7.4-fpm + - docker-compose -f test/7.4/docker-compose.yml up -d script: - - docker exec php7.3 php -v - - docker exec php7.3 sh -c "php -v | grep 7.3" - - docker exec php7.3 sh -c "php test/test.php |grep version" - - docker exec php7.3 composer --version + - docker exec php7.4 php -v + - docker exec php7.4 sh -c "php -v | grep 7.4" + - docker exec php7.4 sh -c "php test/test.php |grep version" + - docker exec php7.4 composer --version - curl -s localhost:8072/test.php |grep bcmath diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a97894..b22a19c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2019-12-18] + +## Added + +- Add PHP 7.4 FPM branch +- Add PHP 7.4 CLI branch + ## [2019-09-22] ## Added diff --git a/Dockerfile b/Dockerfile index 74ef557..0b85f71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-fpm +FROM php:7.4-fpm LABEL maintainer="Vincent Faliès " RUN apt-get update && apt-get install -y \ @@ -42,19 +42,66 @@ RUN apt-get update && apt-get install -y \ librabbitmq-dev \ inetutils-ping \ libaio1 \ - && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ + libonig-dev \ + libpq-dev +RUN PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install -j$(nproc) imap \ && docker-php-ext-configure intl \ && docker-php-ext-install -j$(nproc) intl \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ && docker-php-ext-install -j$(nproc) gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ - && docker-php-ext-install ldap \ - && docker-php-ext-install -j$(nproc) bcmath bz2 calendar ctype curl dba dom enchant exif fileinfo ftp gettext gmp hash iconv \ - mbstring sodium mysqli opcache pcntl pdo pdo_mysql pdo_sqlite phar posix pspell readline recode \ - session shmop simplexml snmp soap sockets sysvmsg sysvsem sysvshm tidy tokenizer wddx xml xmlrpc \ - xmlwriter xsl zip \ - && apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y \ + && docker-php-ext-install ldap +RUN docker-php-ext-install -j$(nproc) bcmath bz2 calendar ctype curl dba dom enchant exif ffi fileinfo filter ftp gd gettext gmp +RUN docker-php-ext-install -j$(nproc) iconv +RUN docker-php-ext-install -j$(nproc) intl +RUN docker-php-ext-install -j$(nproc) json +RUN docker-php-ext-install -j$(nproc) ldap +RUN docker-php-ext-install -j$(nproc) mbstring +RUN docker-php-ext-install -j$(nproc) mysqli +# RUN docker-php-ext-install -j$(nproc) oci8 +# RUN apt-get install -y unixodbc unixodbc-dev +# RUN docker-php-ext-configure odbc --with-pdo-odbc=unixODBC,/usr +# RUN docker-php-ext-install -j$(nproc) odbc +RUN docker-php-ext-install -j$(nproc) opcache +RUN docker-php-ext-install -j$(nproc) pcntl +RUN docker-php-ext-install -j$(nproc) pdo +# RUN docker-php-ext-install -j$(nproc) pdo_dblib +# RUN apt-get install -y libfbclient2 +# RUN docker-php-ext-install -j$(nproc) pdo_firebird +RUN docker-php-ext-install -j$(nproc) pdo_mysql +# RUN docker-php-ext-install -j$(nproc) pdo_oci +# RUN docker-php-ext-install -j$(nproc) pdo_odbc +RUN docker-php-ext-install -j$(nproc) pdo_pgsql +RUN docker-php-ext-install -j$(nproc) pdo_sqlite +RUN docker-php-ext-install -j$(nproc) pgsql +RUN docker-php-ext-install -j$(nproc) phar +RUN docker-php-ext-install -j$(nproc) posix +RUN docker-php-ext-install -j$(nproc) pspell +RUN docker-php-ext-install -j$(nproc) readline +# RUN docker-php-ext-install -j$(nproc) reflection +RUN docker-php-ext-install -j$(nproc) session +RUN docker-php-ext-install -j$(nproc) shmop +RUN docker-php-ext-install -j$(nproc) simplexml +RUN docker-php-ext-install -j$(nproc) snmp +RUN docker-php-ext-install -j$(nproc) soap +RUN docker-php-ext-install -j$(nproc) sockets +RUN docker-php-ext-install -j$(nproc) sodium +# RUN apt-get install -y libargon2-0 libargon2-0-dev +RUN docker-php-ext-install -j$(nproc) sysvmsg +RUN docker-php-ext-install -j$(nproc) sysvsem +RUN docker-php-ext-install -j$(nproc) sysvshm +RUN docker-php-ext-install -j$(nproc) tidy +RUN docker-php-ext-install -j$(nproc) tokenizer +RUN docker-php-ext-install -j$(nproc) xml +# RUN docker-php-ext-install -j$(nproc) xmlreader +RUN docker-php-ext-install -j$(nproc) xmlrpc +RUN docker-php-ext-install -j$(nproc) xmlwriter +RUN docker-php-ext-install -j$(nproc) xsl +RUN docker-php-ext-install -j$(nproc) zend_test +RUN docker-php-ext-install -j$(nproc) zip + +RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* # set up sendmail config diff --git a/README.md b/README.md index dde5e0a..0f342e0 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,12 @@ Nine PHP versions are available through image's tags: - 7.1 FPM - 7.2 FPM - 7.3 FPM +- 7.4 FPM - 7.0 CLI - 7.1 CLI - 7.2 CLI - 7.3 CLI +- 7.4 CLI The latest version of EnvDevPHPBase (latest) (`vfac/envdevphpbase`) is a image with the last version of PHP FPM available. diff --git a/test/7.3/docker-compose.yml b/test/7.4/docker-compose.yml similarity index 89% rename from test/7.3/docker-compose.yml rename to test/7.4/docker-compose.yml index 9cd0abc..dad1140 100644 --- a/test/7.3/docker-compose.yml +++ b/test/7.4/docker-compose.yml @@ -13,7 +13,7 @@ services: - "$PWD/test:/var/www/html" fpm: - image: vfac/envdevphpbase:7.2 + image: vfac/envdevphpbase:7.4 expose: - 9000 volumes: diff --git a/test/7.3/nginx/Dockerfile b/test/7.4/nginx/Dockerfile similarity index 100% rename from test/7.3/nginx/Dockerfile rename to test/7.4/nginx/Dockerfile diff --git a/test/7.3/nginx/nginx.conf b/test/7.4/nginx/nginx.conf similarity index 100% rename from test/7.3/nginx/nginx.conf rename to test/7.4/nginx/nginx.conf diff --git a/test/7.3/nginx/www.conf b/test/7.4/nginx/www.conf similarity index 100% rename from test/7.3/nginx/www.conf rename to test/7.4/nginx/www.conf From 395bc1bf2afeaf96eafe7480da170fac9566f8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fali=C3=A8s?= Date: Sun, 29 Dec 2019 16:19:10 +0100 Subject: [PATCH 4/6] Optimiez Dockerfile --- Dockerfile | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b85f71..ed8a00e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,54 +52,21 @@ RUN PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ss && docker-php-ext-install -j$(nproc) gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install ldap -RUN docker-php-ext-install -j$(nproc) bcmath bz2 calendar ctype curl dba dom enchant exif ffi fileinfo filter ftp gd gettext gmp -RUN docker-php-ext-install -j$(nproc) iconv -RUN docker-php-ext-install -j$(nproc) intl -RUN docker-php-ext-install -j$(nproc) json -RUN docker-php-ext-install -j$(nproc) ldap -RUN docker-php-ext-install -j$(nproc) mbstring -RUN docker-php-ext-install -j$(nproc) mysqli +RUN docker-php-ext-install -j$(nproc) bcmath bz2 calendar ctype curl dba dom enchant exif ffi fileinfo filter ftp gd gettext gmp iconv intl json ldap \ + mbstring mysqli opcache pcntl pdo pdo_mysql pdo_pgsql pdo_sqlite pgsql phar posix pspell readline session shmop simplexml snmp soap sockets sodium \ + sysvmsg sysvsem sysvshm tidy tokenizer xml xmlrpc xmlwriter xsl zend_test zip # RUN docker-php-ext-install -j$(nproc) oci8 # RUN apt-get install -y unixodbc unixodbc-dev # RUN docker-php-ext-configure odbc --with-pdo-odbc=unixODBC,/usr # RUN docker-php-ext-install -j$(nproc) odbc -RUN docker-php-ext-install -j$(nproc) opcache -RUN docker-php-ext-install -j$(nproc) pcntl -RUN docker-php-ext-install -j$(nproc) pdo # RUN docker-php-ext-install -j$(nproc) pdo_dblib # RUN apt-get install -y libfbclient2 # RUN docker-php-ext-install -j$(nproc) pdo_firebird -RUN docker-php-ext-install -j$(nproc) pdo_mysql # RUN docker-php-ext-install -j$(nproc) pdo_oci # RUN docker-php-ext-install -j$(nproc) pdo_odbc -RUN docker-php-ext-install -j$(nproc) pdo_pgsql -RUN docker-php-ext-install -j$(nproc) pdo_sqlite -RUN docker-php-ext-install -j$(nproc) pgsql -RUN docker-php-ext-install -j$(nproc) phar -RUN docker-php-ext-install -j$(nproc) posix -RUN docker-php-ext-install -j$(nproc) pspell -RUN docker-php-ext-install -j$(nproc) readline # RUN docker-php-ext-install -j$(nproc) reflection -RUN docker-php-ext-install -j$(nproc) session -RUN docker-php-ext-install -j$(nproc) shmop -RUN docker-php-ext-install -j$(nproc) simplexml -RUN docker-php-ext-install -j$(nproc) snmp -RUN docker-php-ext-install -j$(nproc) soap -RUN docker-php-ext-install -j$(nproc) sockets -RUN docker-php-ext-install -j$(nproc) sodium # RUN apt-get install -y libargon2-0 libargon2-0-dev -RUN docker-php-ext-install -j$(nproc) sysvmsg -RUN docker-php-ext-install -j$(nproc) sysvsem -RUN docker-php-ext-install -j$(nproc) sysvshm -RUN docker-php-ext-install -j$(nproc) tidy -RUN docker-php-ext-install -j$(nproc) tokenizer -RUN docker-php-ext-install -j$(nproc) xml # RUN docker-php-ext-install -j$(nproc) xmlreader -RUN docker-php-ext-install -j$(nproc) xmlrpc -RUN docker-php-ext-install -j$(nproc) xmlwriter -RUN docker-php-ext-install -j$(nproc) xsl -RUN docker-php-ext-install -j$(nproc) zend_test -RUN docker-php-ext-install -j$(nproc) zip RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* From 9d7dbc09018d18f99a235df0cc9e24fc4c5a2d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fali=C3=A8s?= Date: Mon, 30 Dec 2019 22:02:54 +0100 Subject: [PATCH 5/6] Remove useless comment --- Dockerfile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed8a00e..4859a94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,18 +55,6 @@ RUN PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ss RUN docker-php-ext-install -j$(nproc) bcmath bz2 calendar ctype curl dba dom enchant exif ffi fileinfo filter ftp gd gettext gmp iconv intl json ldap \ mbstring mysqli opcache pcntl pdo pdo_mysql pdo_pgsql pdo_sqlite pgsql phar posix pspell readline session shmop simplexml snmp soap sockets sodium \ sysvmsg sysvsem sysvshm tidy tokenizer xml xmlrpc xmlwriter xsl zend_test zip -# RUN docker-php-ext-install -j$(nproc) oci8 -# RUN apt-get install -y unixodbc unixodbc-dev -# RUN docker-php-ext-configure odbc --with-pdo-odbc=unixODBC,/usr -# RUN docker-php-ext-install -j$(nproc) odbc -# RUN docker-php-ext-install -j$(nproc) pdo_dblib -# RUN apt-get install -y libfbclient2 -# RUN docker-php-ext-install -j$(nproc) pdo_firebird -# RUN docker-php-ext-install -j$(nproc) pdo_oci -# RUN docker-php-ext-install -j$(nproc) pdo_odbc -# RUN docker-php-ext-install -j$(nproc) reflection -# RUN apt-get install -y libargon2-0 libargon2-0-dev -# RUN docker-php-ext-install -j$(nproc) xmlreader RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* From 205bf7b40794fe812236a6c2f5ddb36413b3097f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fali=C3=A8s?= Date: Tue, 31 Dec 2019 09:56:01 +0100 Subject: [PATCH 6/6] Update changelog & license --- CHANGELOG.md | 3 ++- LICENSE | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b22a19c..ca9ff9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [2019-12-18] +## [2019-12-31] ## Added - Add PHP 7.4 FPM branch - Add PHP 7.4 CLI branch +- Add PHP 7.4 FPM ALpine branch ## [2019-09-22] diff --git a/LICENSE b/LICENSE index 0bd74ef..450f771 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2018 Vincent Faliès +Copyright (c) 2017-2020 Vincent Faliès Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal