on going version 3

build/docker/Dockerfile

@@ -1,20 +1,34 @@
-FROM php:7.2-apache
+FROM php:7.3-apache
 
-ENV HOST_USER_ID 33
+ENV WWW_USER_ID 33
+ENV WWW_GROUP_ID 33
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
+ENV PHP_INI_MEMORY_LIMIT 256M
 
-RUN apt-get update && apt-get install -y libpng16-16 libpng-dev libjpeg62-turbo libjpeg62-turbo-dev libldap2-dev zlib1g-dev libicu-dev g++\
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libjpeg62-turbo \
+        libpng-dev \
+        libpng16-16 \
+        libldap2-dev \
+        libxml2-dev \
+        libzip-dev \
+        zlib1g-dev \
+        libicu-dev \
+        g++ \
+        default-mysql-client \
+        unzip \
+        curl \
+        apt-utils \
+    && apt-get autoremove -y \
     && 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-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
-	&& docker-php-ext-install zip \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-        && docker-php-ext-install ldap \
+    && docker-php-ext-install -j$(nproc) ldap && \
-        && docker-php-ext-install mysqli \
+    mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
-        && docker-php-ext-install calendar \
-        && docker-php-ext-configure intl \
-        && docker-php-ext-install intl \
-        && apt-get autoremove --purge -y libpng-dev libjpeg62-turbo-dev libldap2-dev zlib1g-dev libicu-dev g++
 
 RUN mkdir /var/documents
 RUN chown www-data /var/documents
@@ -23,16 +37,16 @@ COPY docker-run.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-run.sh
 
 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 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_autostart=0' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_enable=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.default_enable=0' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini
+#RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_connect_back=0' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
+RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> ${PHP_INI_DIR}/php.ini
-RUN echo '172.17.0.1 docker.host' >> /etc/hosts
+#RUN echo '172.17.0.1 docker.host' >> /etc/hosts
 
 EXPOSE 80
 

build/docker/docker-compose.yml

@@ -1,31 +1,46 @@
-mariadb:
+version: '3'
-    build: mariadb
+
+networks:
+    internal-pod:
+        internal: true
+    external-pod:
+        internal: false
+
+services:
+    mariadb:
+        image: mariadb:latest
         environment:
             MYSQL_ROOT_PASSWORD: root
             MYSQL_DATABASE: dolibarr
+        networks:
+            - internal-pod
 
-phpmyadmin:
+    phpmyadmin:
         image: phpmyadmin/phpmyadmin
         environment:
             PMA_HOST: mariadb
-    links:
+        depends_on:
             - mariadb
         ports:
             - "8080:80"
 
-web:
+    web:
-    build: .
+        build:
+            context: .
         environment:
             HOST_USER_ID: $HOST_USER_ID
         volumes:
-        - ../../htdocs:/var/www/html
+            - ../../htdocs:/var/www/html/
-    links:
-        - mariadb
-        - mail
         ports:
             - "80:80"
+        depends_on:
+            - mariadb
+            - mail
+        networks:
+            - internal-pod
+            - external-pod
 
-mail:
+    mail:
         image: maildev/maildev
         ports:
             - "8081:80"

htdocs/install/fileconf.php

@@ -31,7 +31,7 @@ include_once 'inc.php';
 
 global $langs;
 
-$err = 0;
+$err = 0
 
 $setuplang = GETPOST("selectlang", '', 3) ?GETPOST("selectlang", '', 3) : (isset($_GET["lang"]) ? $_GET["lang"] : 'auto');
 $langs->setDefaultLang($setuplang);