From 5658c16f22858db0600288e43d3809964724832f Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 24 Jul 2019 18:11:42 +0200 Subject: [PATCH 01/11] First cut of php 7.4 (alpha3) docker image --- Dockerfile | 2 +- root/tmp/setup/php-extensions.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1a7b3b..94eef4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-apache-buster +FROM php:7.4.0alpha3-apache-buster ADD root/ / # Fix the original permissions of /tmp, the PHP default upload tmp dir. diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index bcb2c3a..7c9ad0f 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -51,7 +51,7 @@ docker-php-ext-install -j$(nproc) \ xmlrpc # GD. -docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ +docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ docker-php-ext-install -j$(nproc) gd # LDAP. @@ -63,7 +63,7 @@ pecl install memcached mongodb redis apcu igbinary docker-php-ext-enable memcached mongodb redis apcu igbinary # ZIP -docker-php-ext-configure zip --with-libzip +docker-php-ext-configure zip --with-zip docker-php-ext-install zip echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini From 80142ec616154c95b9b6622135e94847f2b5d3c1 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Thu, 25 Jul 2019 13:04:52 +0200 Subject: [PATCH 02/11] Let's remain sticky to Redis 4.3.0 Some days ago Redis 5.0.0 was released and it includes some changes that require verification in core functionality and associated unit tests (now failing). To be handled by: https://tracker.moodle.org/browse/MDL-66139 Once that issue is fixed... surely we can unpin this. Ciao :-) --- root/tmp/setup/php-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index 7c9ad0f..4e6050d 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -59,7 +59,7 @@ docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ docker-php-ext-install -j$(nproc) ldap # Memcached, MongoDB, Redis, APCu, igbinary. -pecl install memcached mongodb redis apcu igbinary +pecl install memcached mongodb redis-4.3.0 apcu igbinary docker-php-ext-enable memcached mongodb redis apcu igbinary # ZIP From bfaf923568bff09cca761c6f259fdf7b009baa9b Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sun, 28 Jul 2019 18:32:56 +0200 Subject: [PATCH 03/11] Bump to php74beta1 + disable sqlsrv php74beta1 broke sqlsrv, that's being tracked @ https://github.com/microsoft/msphpsql/issues/999 --- Dockerfile | 2 +- README.md | 2 +- root/tmp/setup/php-extensions.sh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94eef4e..7042275 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.0alpha3-apache-buster +FROM php:7.4.0beta1-apache-buster ADD root/ / # Fix the original permissions of /tmp, the PHP default upload tmp dir. diff --git a/README.md b/README.md index 870e1e7..5fc07b6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Moodle PHP environment configured for Moodle development based on [Official PH | PHP Version | Variant | Tags | Status | |--------------|---------|------------------|--------| -| PHP 7.3 | Buster | 7.3-buster | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=7.3-buster)](https://travis-ci.org/moodlehq/moodle-php-apache)| +| PHP 7.4beta1 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| For a complete list of supported versions, look to the [master README](https://github.com/moodlehq/moodle-php-apache/tree/master). diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index 4e6050d..58c02e8 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -84,7 +84,9 @@ echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini # Install Microsoft dependencies for sqlsrv. # (kept apart for clarity, still need to be run here # before some build packages are deleted) -/tmp/setup/sqlsrv-extension.sh +# NOTE: As of 20190727 5.6.1 does not build with php7.4beta1, so commented out. +# Link: https://github.com/microsoft/msphpsql/issues/999 +# /tmp/setup/sqlsrv-extension.sh # Keep our image size down.. pecl clear-cache From 52a077cb8db1425d5045e4ea38fa17a91b9e0064 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 27 Aug 2019 14:24:07 +0200 Subject: [PATCH 04/11] Bump to php74 beta4. Keep sqlsrv disabled. --- Dockerfile | 2 +- README.md | 2 +- root/tmp/setup/php-extensions.sh | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7042275..723ec45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.0beta1-apache-buster +FROM php:7.4.0beta4-apache-buster ADD root/ / # Fix the original permissions of /tmp, the PHP default upload tmp dir. diff --git a/README.md b/README.md index 5fc07b6..c770bf7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Moodle PHP environment configured for Moodle development based on [Official PH | PHP Version | Variant | Tags | Status | |--------------|---------|------------------|--------| -| PHP 7.4beta1 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| +| PHP 7.4beta4 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| For a complete list of supported versions, look to the [master README](https://github.com/moodlehq/moodle-php-apache/tree/master). diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index 58c02e8..4d24cda 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -85,6 +85,8 @@ echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini # (kept apart for clarity, still need to be run here # before some build packages are deleted) # NOTE: As of 20190727 5.6.1 does not build with php7.4beta1, so commented out. +# NOTE: As of 20190827 5.6.1 does not build with php7.4beta4, so commented out. +# The underlying issue has been fixed but there isn't any > 5.6.1 release including it. # Link: https://github.com/microsoft/msphpsql/issues/999 # /tmp/setup/sqlsrv-extension.sh From 0a973181965fd26bbfc80ea8853e704f243fe655 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Thu, 29 Aug 2019 00:39:23 +0200 Subject: [PATCH 05/11] Unpin Redis 4.3.0. Newer >= 5.0.0 versions should be back to work. Once https://tracker.moodle.org/browse/MDL-66139 is rolled. --- root/tmp/setup/php-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index 4d24cda..ce9f4ee 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -59,7 +59,7 @@ docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ docker-php-ext-install -j$(nproc) ldap # Memcached, MongoDB, Redis, APCu, igbinary. -pecl install memcached mongodb redis-4.3.0 apcu igbinary +pecl install memcached mongodb redis apcu igbinary docker-php-ext-enable memcached mongodb redis apcu igbinary # ZIP From b23c4e5d4a6f6b7bc0fb0374bd37d444be575678 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 6 Sep 2019 02:19:19 +0200 Subject: [PATCH 06/11] Bump to php74 rc1. Keep sqlsrv disabled. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 723ec45..7fe13b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.0beta4-apache-buster +FROM php:7.4.0RC1-apache-buster ADD root/ / # Fix the original permissions of /tmp, the PHP default upload tmp dir. From 6444f28307dd9d9d11284d17a8991e6ccf2d4ebb Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Thu, 12 Sep 2019 00:21:24 +0200 Subject: [PATCH 07/11] Updating to sqlsrv5.7.9preview, first one working with php74rc1 and up --- root/tmp/setup/php-extensions.sh | 6 +----- root/tmp/setup/sqlsrv-extension.sh | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index ce9f4ee..7c9ad0f 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -84,11 +84,7 @@ echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini # Install Microsoft dependencies for sqlsrv. # (kept apart for clarity, still need to be run here # before some build packages are deleted) -# NOTE: As of 20190727 5.6.1 does not build with php7.4beta1, so commented out. -# NOTE: As of 20190827 5.6.1 does not build with php7.4beta4, so commented out. -# The underlying issue has been fixed but there isn't any > 5.6.1 release including it. -# Link: https://github.com/microsoft/msphpsql/issues/999 -# /tmp/setup/sqlsrv-extension.sh +/tmp/setup/sqlsrv-extension.sh # Keep our image size down.. pecl clear-cache diff --git a/root/tmp/setup/sqlsrv-extension.sh b/root/tmp/setup/sqlsrv-extension.sh index 6233704..77a58ce 100755 --- a/root/tmp/setup/sqlsrv-extension.sh +++ b/root/tmp/setup/sqlsrv-extension.sh @@ -15,6 +15,6 @@ ACCEPT_EULA=Y apt-get install -y msodbcsql17 ln -fsv /opt/mssql-tools/bin/* /usr/bin -# Need 5.5.0preview (or later) for PHP 7.3 support -pecl install sqlsrv-5.6.1 +# Need 5.7.0preview (or later) for PHP 7.4 support +pecl install sqlsrv-5.7.0preview docker-php-ext-enable sqlsrv From 2aba55003720c7d6bf10d13001599c519b970873 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 9 Oct 2019 14:10:49 +0200 Subject: [PATCH 08/11] Bump to php74 rc3 --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7fe13b5..9d090ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.0RC1-apache-buster +FROM php:7.4.0RC3-apache-buster ADD root/ / # Fix the original permissions of /tmp, the PHP default upload tmp dir. diff --git a/README.md b/README.md index c770bf7..d8b67a0 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Moodle PHP environment configured for Moodle development based on [Official PH | PHP Version | Variant | Tags | Status | |--------------|---------|------------------|--------| -| PHP 7.4beta4 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| +| PHP 7.4rc3 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| For a complete list of supported versions, look to the [master README](https://github.com/moodlehq/moodle-php-apache/tree/master). From 4ddacb3d38f66b9e239a205c58cafa700eb96bfd Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 9 Oct 2019 14:34:46 +0200 Subject: [PATCH 09/11] Add the uuid extension. Some tests use it. --- root/tmp/setup/php-extensions.sh | 6 +++--- tests/fixtures/test.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index 7c9ad0f..e8cb462 100755 --- a/root/tmp/setup/php-extensions.sh +++ b/root/tmp/setup/php-extensions.sh @@ -7,7 +7,7 @@ echo "Installing apt dependencies" # Build packages will be added during the build, but will be removed at the end. BUILD_PACKAGES="gettext gnupg libcurl4-openssl-dev libfreetype6-dev libicu-dev libjpeg62-turbo-dev \ libldap2-dev libmariadbclient-dev libmemcached-dev libpng-dev libpq-dev libxml2-dev libxslt-dev \ - unixodbc-dev" + unixodbc-dev uuid-dev" # Packages for Postgres. PACKAGES_POSTGRES="libpq5" @@ -59,8 +59,8 @@ docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ docker-php-ext-install -j$(nproc) ldap # Memcached, MongoDB, Redis, APCu, igbinary. -pecl install memcached mongodb redis apcu igbinary -docker-php-ext-enable memcached mongodb redis apcu igbinary +pecl install memcached mongodb redis apcu igbinary uuid +docker-php-ext-enable memcached mongodb redis apcu igbinary uuid # ZIP docker-php-ext-configure zip --with-zip diff --git a/tests/fixtures/test.php b/tests/fixtures/test.php index ad31703..9694567 100644 --- a/tests/fixtures/test.php +++ b/tests/fixtures/test.php @@ -18,6 +18,7 @@ 'xsl', 'xmlrpc', 'zip', + 'uuid' ]; $buffer = '';; From 576d019a4e6a3579db38f29a926d86532362e174 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 19 Nov 2019 10:55:08 +0100 Subject: [PATCH 10/11] Bump to php74 rc6 --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d090ef..b5dff1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.0RC3-apache-buster +FROM php:7.4.0RC6-apache-buster ADD root/ / # Fix the original permissions of /tmp, the PHP default upload tmp dir. diff --git a/README.md b/README.md index d8b67a0..46d2d43 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Moodle PHP environment configured for Moodle development based on [Official PH | PHP Version | Variant | Tags | Status | |--------------|---------|------------------|--------| -| PHP 7.4rc3 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| +| PHP 7.4rc6 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| For a complete list of supported versions, look to the [master README](https://github.com/moodlehq/moodle-php-apache/tree/master). From 5d6c33f86c2d416bf798bc361a330ed2d93ce641 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 29 Nov 2019 11:43:47 +0100 Subject: [PATCH 11/11] 7.4.0 (buster only) released Also, added the post_push hook to get the 7.4 tag available --- Dockerfile | 2 +- README.md | 2 +- hooks/post_push | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 hooks/post_push diff --git a/Dockerfile b/Dockerfile index b5dff1e..dcb9431 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.0RC6-apache-buster +FROM php:7.4-apache-buster ADD root/ / # Fix the original permissions of /tmp, the PHP default upload tmp dir. diff --git a/README.md b/README.md index 46d2d43..349969a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Moodle PHP environment configured for Moodle development based on [Official PH | PHP Version | Variant | Tags | Status | |--------------|---------|------------------|--------| -| PHP 7.4rc6 | Buster | 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| +| PHP 7.4 | Buster | 7.4, 7.4-buster | [![Build Status](https://travis-ci.org/stronk7/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.org/stronk7/moodle-php-apache)| For a complete list of supported versions, look to the [master README](https://github.com/moodlehq/moodle-php-apache/tree/master). diff --git a/hooks/post_push b/hooks/post_push new file mode 100644 index 0000000..9c03552 --- /dev/null +++ b/hooks/post_push @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e + +# A space-separated list of additional tags to place on this image. +additionalTags=(7.4) + +# Tag and push image for each additional tag +for tag in ${additionalTags[@]}; do + echo "Tagging {$IMAGE_NAME} as ${DOCKER_REPO}:${tag}" + docker tag $IMAGE_NAME ${DOCKER_REPO}:${tag} + + echo "Pushing ${DOCKER_REPO}:${tag}" + docker push ${DOCKER_REPO}:${tag} +done