From 08b1d61f046f141ba0ad733662c02f9343a1fc42 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 13 Jun 2024 15:39:48 +0200
Subject: [PATCH] restructrue

---
 docker/WebDockerfile         |  5 ++++-
 docker/data/000-default.conf | 13 +++++++++++++
 docker/data/20-xdebug.ini    |  7 +++++++
 docker/docker-compose.yml    |  2 ++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 docker/data/000-default.conf
 create mode 100644 docker/data/20-xdebug.ini

diff --git a/docker/WebDockerfile b/docker/WebDockerfile
index cb90f84..98c75cb 100644
--- a/docker/WebDockerfile
+++ b/docker/WebDockerfile
@@ -47,7 +47,10 @@ RUN a2enmod php8.3 && \
 EXPOSE 80
 
 # Setup php-xdebug
-RUN echo -e "zend_extension=xdebug.so\nxdebug.mode=debug,profile,trace\nxdebug.start_with_request=yes\nxdebug.client_port=9003\nxdebug.client_host=localhost\nxdebug.trace_format=1" > /etc/php/8.3/apache2/conf.d/20-xdebug.ini
+COPY data/000-default.conf /etc/apache2/sites-enabled/000-default.conf
+COPY data/20-xdebug.ini /etc/php/8.3/apache2/conf.d/20-xdebug.ini
+
+RUN echo "ServerName 127.0.0.2" >> /etc/apache2/apache2.conf
 
 RUN service apache2 restart
 
diff --git a/docker/data/000-default.conf b/docker/data/000-default.conf
new file mode 100644
index 0000000..9411670
--- /dev/null
+++ b/docker/data/000-default.conf
@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+        ServerAdmin webmaster@localhost
+        DocumentRoot /var/www/html
+
+        <Directory /var/www/html>
+                Options Indexes FollowSymLinks
+                AllowOverride All
+                Require all granted
+        </Directory>
+
+        ErrorLog ${APACHE_LOG_DIR}/error.log
+        CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
\ No newline at end of file
diff --git a/docker/data/20-xdebug.ini b/docker/data/20-xdebug.ini
new file mode 100644
index 0000000..7df60fc
--- /dev/null
+++ b/docker/data/20-xdebug.ini
@@ -0,0 +1,7 @@
+error_reporting=E_ALL
+zend_extension=xdebug.so
+xdebug.mode=debug,profile,trace
+xdebug.start_with_request=yes
+xdebug.client_port=9003
+xdebug.client_host=host.docker.internal
+xdebug.trace_format=1
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 84fe9d4..2a74cb7 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -19,6 +19,8 @@ services:
     ports:
       - "127.0.0.2:80:80"
       - "127.0.0.2:9003:9003"
+    extra_hosts:
+      host.docker.internal: host-gateway
     volumes:
       - ./../../:/var/www/html
     depends_on: