From 5d71e2e17de521afc33838320466cbe6939e80a6 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Fri, 2 Aug 2019 16:24:35 +0200
Subject: [PATCH] New 7.2-buster build

(not to be used by default 7.2 yet, but hopefully soon)
---
 Dockerfile                       |  2 +-
 README.md                        |  2 +-
 hooks/post_push                  | 15 ---------------
 root/tmp/setup/php-extensions.sh |  4 ++--
 4 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 hooks/post_push

diff --git a/Dockerfile b/Dockerfile
index 9e871ab..4be3980 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-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 51f0212..9e9445c 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.2      | Stretch | 7.2, 7.2-stretch | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=7.2-stretch)](https://travis-ci.org/moodlehq/moodle-php-apache)|
+| PHP 7.2      | Buster  | 7.2-buster       | [![Build Status](https://travis-ci.org/moodlehq/moodle-php-apache.svg?branch=7.2-buster)](https://travis-ci.org/moodlehq/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
deleted file mode 100644
index 4126b3b..0000000
--- a/hooks/post_push
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# A space-separated list of additional tags to place on this image.
-additionalTags=(7.2)
-
-# 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 ed54fa6..e70e38f 100755
--- a/root/tmp/setup/php-extensions.sh
+++ b/root/tmp/setup/php-extensions.sh
@@ -13,10 +13,10 @@ BUILD_PACKAGES="gettext gnupg libcurl4-openssl-dev libfreetype6-dev libicu-dev l
 PACKAGES_POSTGRES="libpq5"
 
 # Packages for MariaDB and MySQL.
-PACKAGES_MYMARIA="libmariadbclient18"
+PACKAGES_MYMARIA="libmariadb3"
 
 # Packages for other Moodle runtime dependenices.
-PACKAGES_RUNTIME="ghostscript libaio1 libcurl3 libgss3 libicu57 libmcrypt-dev libxml2 libxslt1.1 \
+PACKAGES_RUNTIME="ghostscript libaio1 libcurl4 libgss3 libicu63 libmcrypt-dev libxml2 libxslt1.1 \
   libzip-dev locales sassc unixodbc unzip zip"
 
 # Packages for Memcached.