From e1e6363611ad4e162ed9d54d7786b1a895226037 Mon Sep 17 00:00:00 2001
From: Antonios Pavlakis <antonios.pavlakis@staysafeapp.com>
Date: Wed, 26 May 2021 16:54:10 +0100
Subject: [PATCH] Update Docker to v3, PHP 8.0 and Xdebug 3.0.3

---
 docker-compose.yml    | 6 +++---
 docker/web/Dockerfile | 8 ++++----
 docker/web/xdebug.ini | 9 ++-------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3a4518e..97c6d64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 services:
 
     phpminds-api-web:
@@ -15,8 +15,8 @@ services:
         volumes:
             - ${WEB_APP_PATH}:/var/www/html:cached
 
-
     phpminds-api-db:
+        platform: linux/x86_64
         image: mysql:5.7.22
         restart: always
         ports:
@@ -24,5 +24,5 @@ services:
         env_file:
           - .env
         volumes:
-            - ${WEB_APP_PATH}:/var/www/html:cached
+            - ./.data/db:/var/lib/mysql
 
diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
index c9bc202..f2b6b70 100644
--- a/docker/web/Dockerfile
+++ b/docker/web/Dockerfile
@@ -1,7 +1,7 @@
-FROM pavlakis/xdebug:2.9.8 AS xdebug
-FROM pavlakis/php-apache-common:7.4.10
+FROM pavlakis/xdebug:3.0.3 AS xdebug
+FROM pavlakis/php-apache-common:8.0.3
 
 COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
-ADD apache.conf /etc/apache2/sites-available/000-default.conf
+COPY apache.conf /etc/apache2/sites-available/000-default.conf
 
-COPY --from=xdebug /usr/local/lib/php/extensions/no-debug-non-zts-20190902/xdebug.so /usr/local/lib/php/extensions/no-debug-non-zts-20190902/xdebug.so
+COPY --from=xdebug /usr/local/lib/php/extensions/no-debug-non-zts-20200930/xdebug.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/xdebug.so
\ No newline at end of file
diff --git a/docker/web/xdebug.ini b/docker/web/xdebug.ini
index 29f7092..e5a5bc6 100644
--- a/docker/web/xdebug.ini
+++ b/docker/web/xdebug.ini
@@ -1,10 +1,5 @@
 ; Enable xdebug extension module
 zend_extension=xdebug.so
 
-;xdebug.remote_log="/var/log/xdebug/xdebug.log"
-;xdebug.profiler_enable = 0
-xdebug.remote_enable=1
-xdebug.remote_port=9099
-xdebug.remote_autostart=1
-xdebug.remote_connect_back=0
-xdebug.idekey=editor-xdebug
\ No newline at end of file
+xdebug.mode=coverage,develop,debug
+xdebug.start_with_request=yes