From b7f4162721a8ac7e5e50b1bb7781c2a2d19b1dc1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 28 Aug 2020 12:10:08 +0200
Subject: [PATCH] use new version docker file

---
 build/docker/Dockerfile         | 12 ++++++------
 build/docker/docker-compose.yml |  3 +++
 build/docker/docker-run.sh      |  5 ++---
 htdocs/install/fileconf.php     |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index bf50a585a41..ca5f990a802 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update -y \
     && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
     && docker-php-ext-install -j$(nproc) ldap && \
-    mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
+    mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
 
 RUN mkdir /var/documents
 RUN chown www-data /var/documents
@@ -38,15 +38,15 @@ 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-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_autostart=0' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_autostart=1' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.remote_enable=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.default_enable=0' >> ${PHP_INI_DIR}/php.ini
-#RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.default_enable=1' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.remote_port=9000' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_connect_back=0' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_connect_back=1' >> ${PHP_INI_DIR}/php.ini
 RUN echo 'xdebug.profiler_enable=0' >> ${PHP_INI_DIR}/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
 
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index 5e3a4444e41..1f8f7e3063b 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -23,6 +23,8 @@ services:
             - mariadb
         ports:
             - "8080:80"
+        networks:
+            - internal-pod
 
     web:
         build:
@@ -33,6 +35,7 @@ services:
             - ../../htdocs:/var/www/html/
         ports:
             - "80:80"
+            - "9000:9001"
         depends_on:
             - mariadb
             - mail
diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh
index df7272c317d..cec7e138b4a 100644
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-usermod -u $HOST_USER_ID www-data
-groupmod -g $HOST_USER_ID www-data
+usermod -u "${HOST_USER_ID}" www-data
+groupmod -g "${HOST_USER_ID}" www-data
 
 chgrp -hR www-data /var/www/html
 chmod g+rwx /var/www/html/conf
@@ -9,7 +9,6 @@ chmod g+rwx /var/www/html/conf
 if [ ! -f /usr/local/etc/php/php.ini ]; then
   cat <<EOF > /usr/local/etc/php/php.ini
 date.timezone = $PHP_INI_DATE_TIMEZONE
-display_errors = On
 EOF
 fi
 
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 14f3d19bdf9..4e914e1a4f3 100644
--- a/htdocs/install/fileconf.php
+++ b/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);