diff --git a/Dockerfile b/Dockerfile index f1a7b3b..dcb9431 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3-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 870e1e7..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.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.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 diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh index bcb2c3a..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" @@ -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. @@ -59,11 +59,11 @@ 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-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 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 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 = '';;