Merge pull request moodlehq#103 from stronk7/7.4-buster

7.4 buster

Author: stronk7

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.

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).
 

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

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,19 +51,19 @@ 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.
 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

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

tests/fixtures/test.php

@@ -18,6 +18,7 @@
     'xsl',
     'xmlrpc',
     'zip',
+    'uuid'
 ];
 
 $buffer = '';;