From b16f43d65fa14c26bd5a564816d97c375c890286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=C3=A0o=20Ho=C3=A0ng=20S=C6=A1n?=
 <daohoangson@gmail.com>
Date: Fri, 26 Jun 2020 11:35:51 +0700
Subject: [PATCH 1/3] Install ffmpeg on php-apache

---
 php-apache/tmp/build_apache.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/php-apache/tmp/build_apache.sh b/php-apache/tmp/build_apache.sh
index ddd1348..a5af70a 100755
--- a/php-apache/tmp/build_apache.sh
+++ b/php-apache/tmp/build_apache.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+# ffmpeg
+apt-get install -y ffmpeg
+
 # phpcs
 pear install PHP_CodeSniffer
 curl -Lo /tmp/PHPCompatibility.tar.gz "https://github.com/wimg/PHPCompatibility/archive/${PHP_COMPATIBILITY_VERSION}.tar.gz"

From 70f4b7fe7883c90ed03e5c4b1af91cb1925a0e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=C3=A0o=20Ho=C3=A0ng=20S=C6=A1n?=
 <daohoangson@gmail.com>
Date: Fri, 26 Jun 2020 11:36:21 +0700
Subject: [PATCH 2/3] Update VERSION

---
 php-apache/VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-apache/VERSION b/php-apache/VERSION
index a36c95c..a20dd45 100644
--- a/php-apache/VERSION
+++ b/php-apache/VERSION
@@ -1 +1 @@
-7.3.12c
+7.3.12d

From 54dad79867f48e206262b937085f2a9d6e2c2fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=C3=A0o=20Ho=C3=A0ng=20S=C6=A1n?=
 <daohoangson@gmail.com>
Date: Fri, 26 Jun 2020 11:42:29 +0700
Subject: [PATCH 3/3] Escape $CIRCLE_BRANCH to avoid special characters

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 10b26cf..fbf31ac 100755
--- a/build.sh
+++ b/build.sh
@@ -31,8 +31,8 @@ for d in */ ; do
 
     VERSION="$( head -n 1 "VERSION" )"
     TAG="xfrocks/xenforo:${d%?}"
-    if [ "x$CIRCLE_BRANCH" != 'xmaster' ]; then
-        TAG="$TAG-$CIRCLE_BRANCH"
+    if [ "x$CIRCLE_BRANCH" != 'x' -a "x$CIRCLE_BRANCH" != 'xmaster' ]; then
+        TAG="$TAG-`echo $CIRCLE_BRANCH | sed 's#[^a-z0-9]#-#g'`"
     fi
     TAG_WITH_VERSION="$TAG-$VERSION"