From 259c94e3201d4683aa738042d8e781cf94648806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cserveny=2C=20Tam=C3=A1s?= <cserveny.tamas@gmail.com>
Date: Thu, 20 Jan 2022 17:57:21 +0100
Subject: [PATCH] fix docker build setup

---
 build/docker/Dockerfile         | 13 ++++---------
 build/docker/docker-compose.yml |  3 +++
 htdocs/install/default.css      |  2 --
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index dca74e9e720..e38ad20931d 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -39,15 +39,10 @@ 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=1' >> ${PHP_INI_DIR}/php.ini
-RUN echo 'xdebug.remote_enable=1' >> ${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=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 'localhost docker.host' >> /etc/hosts
+RUN echo 'xdebug.mode=debug' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.client_host=host.docker.internal' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.client_port=9003' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.idekey="netbeans-xdebug"' >> ${PHP_INI_DIR}/php.ini
 
 # set up sendmail config, to use maildev
 RUN echo "account default" > /etc/msmtprc
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index 2167f069f25..8994043cd8a 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -46,6 +46,9 @@ services:
         networks:
             - internal-pod
             - external-pod
+        extra_hosts:
+            - "localhost.localdomain:127.0.0.1"
+            - "host.docker.internal:host-gateway"
 
     mail:
         image: maildev/maildev
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 726f1d2d0c2..96c671d1472 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -473,5 +473,3 @@ table.tablesupport {
 		width: 100%;
 	}
 }
-	
-}