From 5572102ae57fdc0e05528edecb429edcd3663b35 Mon Sep 17 00:00:00 2001
From: Arunas Ruksnaitis <arunas.ruksnaitis@softar.uk>
Date: Tue, 10 Dec 2019 00:30:47 +0000
Subject: [PATCH] Docker corrections

---
 build/docker/Dockerfile         | 18 ++++++++++++------
 build/docker/docker-compose.yml |  2 +-
 build/docker/docker-run.sh      |  3 ++-
 build/docker/mariadb/Dockerfile |  3 +++
 4 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 build/docker/mariadb/Dockerfile

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 0d5918c3f4c..507170c7368 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,31 +1,37 @@
-FROM php:7.0-apache
+FROM php:7.2-apache
 
 ENV HOST_USER_ID 33
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
 
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev \
+RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++\
 	&& rm -rf /var/lib/apt/lists/* \
 	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
 	&& docker-php-ext-install gd \
 	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
         && docker-php-ext-install ldap \
         && docker-php-ext-install mysqli \
-        && apt-get purge -y libjpeg-dev libldap2-dev
+        && docker-php-ext-install calendar \
+        && docker-php-ext-configure intl \
+        && docker-php-ext-install intl \
+        && apt-get autoremove --purge -y libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++
+
+RUN mkdir /var/documents
+RUN chown www-data /var/documents
 
 COPY docker-run.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-run.sh
 
-RUN pecl install xdebug-2.5.5 && docker-php-ext-enable xdebug
+RUN pecl install xdebug && docker-php-ext-enable xdebug
 RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_host=docker.for.mac.host.internal' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
 RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
-
+RUN echo '172.17.0.1 docker.host' >> /etc/hosts
 
 EXPOSE 80
 
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index a2017335197..3fe6125a874 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -1,5 +1,5 @@
 mariadb:
-    image: mariadb:latest
+    build: mariadb
     environment:
         MYSQL_ROOT_PASSWORD: root
         MYSQL_DATABASE: dolibarr
diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh
index c151e1c3cab..df7272c317d 100644
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -3,7 +3,8 @@
 usermod -u $HOST_USER_ID www-data
 groupmod -g $HOST_USER_ID www-data
 
-chown -hR www-data:www-data /var/www
+chgrp -hR www-data /var/www/html
+chmod g+rwx /var/www/html/conf
 
 if [ ! -f /usr/local/etc/php/php.ini ]; then
   cat <<EOF > /usr/local/etc/php/php.ini
diff --git a/build/docker/mariadb/Dockerfile b/build/docker/mariadb/Dockerfile
new file mode 100644
index 00000000000..a4db0f42065
--- /dev/null
+++ b/build/docker/mariadb/Dockerfile
@@ -0,0 +1,3 @@
+FROM mariadb:latest
+# Enable comented out UTF8 charset/collation options
+RUN sed '/utf8/ s/^#//' /etc/mysql/mariadb.cnf >/tmp/t && mv /tmp/t /etc/mysql/mariadb.cnf