From 802cf4b3cb677b08b1a2e2793d9ee8222d36bd5c Mon Sep 17 00:00:00 2001
From: noogen <tom@noogen.net>
Date: Sat, 8 Dec 2018 08:04:57 -0600
Subject: [PATCH] update support for php 7.3

---
 Dockerfile | 12 +++++++++---
 README.md  |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f281e2b..7be0a16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN cd /tmp \
        libxml2-dev libxslt1-dev zlib1g-dev libffi-dev libssl-dev libmagickwand-dev procps imagemagick netcat pkg-config \
        mcrypt pwgen language-pack-en-base libicu-dev g++ cpp libglib2.0-dev incron libcouchbase-dev libcouchbase2-libevent \
        libc6 libcurl3 libgcc1 libgssapi-krb5-2 liblttng-ust0 libssl1.0.0 libstdc++6 libunwind8 libuuid1 zlib1g \
-       php-pear php-xml php7.2-dev php7.2-xml php7.1-dev php7.1-xml \
+       php-pear php-xml php7.3-dev php7.3-xml php7.2-dev php7.2-xml php7.1-dev php7.1-xml \
     && rsync --update -ahp --progress /opt/libv8-6.8/ /usr/local/ \
     && systemctl disable incron \
     && echo 'root' >> /etc/incron.allow \
@@ -26,11 +26,17 @@ RUN cd /tmp \
     && pecl channel-update pecl.php.net \
     && /usr/bin/switch-php.sh "7.1" \
     && pecl -d php_suffix=7.1 install -f --alldeps pcs igbinary couchbase imagick v8 v8js \
+    && mkdir -p /mytmp/20160303 && rsync -ahp /usr/lib/php/20160303/ /mytmp/20160303/ \
+    && rm -rf /tmp/* \
+    && /usr/bin/switch-php.sh "7.3" \
+    && pecl -d php_suffix=7.3 install -f --alldeps pcs igbinary couchbase imagick v8 \
+    && mkdir -p /mytmp/20180731 && rsync -ahp /usr/lib/php/20180731/ /mytmp/20180731/ \
     && rm -rf /tmp/* \
-    && mkdir -p /tmp/20160303 && rsync -ahp /usr/lib/php/20160303/ /tmp/20160303/ \
     && /usr/bin/switch-php.sh "7.2" \
     && pecl -d php_suffix=7.2 install -f --alldeps pcs igbinary couchbase imagick v8 v8js \
-    && rsync -ahp /tmp/20160303/ /usr/lib/php/20160303/ \
+    && rsync -ahp /mytmp/20160303/ /usr/lib/php/20160303/ \
+    && rsync -ahp /mytmp/20180731/ /usr/lib/php/20180731/ \
+    && rm -rf /mytmp \
     && curl -s -o /tmp/python-support_1.0.15_all.deb https://launchpadlibrarian.net/109052632/python-support_1.0.15_all.deb \
     && dpkg -i /tmp/python-support_1.0.15_all.deb \
     && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 \
diff --git a/README.md b/README.md
index 8f86a6d..50111ca 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,20 @@ Based off https://github.com/phusion/baseimage-docker, this primarily build to i
 For convienience, sshd is enabled by default; just don't expose docker port 22 if you don't want to use sshd.
 
 ## php files
-1. pecl install latest v8js for php7.1+
+1. pecl install latest v8 and v8js for php7.1+
 2. pecl install pcs and couchbase for couchdb
 3. imagemagick lib for php-imagick support
 4. composer
 
 ## add repositories
-1. php
+1. php 7.1+
 2. mariadb 10.2
 3. mongodb 3.6
 4. couchbase and couchdb
 
 ## Note
+1.3.0 - add php 7.3 build everything works except pecl php7.3 v8js build.  Note: use the alternative pecl php7.3 v8 module if you need v8 for php7.3 while waiting for pecl php7.3 v8js.
+
 1.2.1 - update v8js build.  Remove things that can be defer later.
 
 1.1.0 - 10/26/2018 remove support for php5.6 and php7.0 as both will be end of life (EOL) by the end of this year: http://php.net/supported-versions.php