Jelajahi Sumber

Xdebug breakpoints not triggering #165

Mark Shust 5 tahun lalu
induk
melakukan
920012a987

+ 6 - 4
README.md

@@ -23,9 +23,9 @@
 
 ## Free Course
 
-I created a free course which details the basic usage of this project:
+I created a free screencast course which details the basic usage of this project:
 
-<a href="https://courses.markshust.com/p/setup-magento-2-development-environment-docker" target="_blank">
+<a href="https://m.academy/p/setup-magento-2-development-environment-docker" target="_blank">
 <img src="https://raw.githubusercontent.com/markshust/docker-magento/master/docs/course.png" alt="Setup a Magento 2 Development Environment with Docker"><br />
 Setup a Magento 2 Development Environment with Docker
 </a>
@@ -46,11 +46,13 @@ View Dockerfiles:
       - [`1.13-0`](https://github.com/markshust/docker-magento/tree/11.0.0/images/nginx/1.13)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
   - 7.2
-      - [`latest`, `7.2-fpm`, `7.2-fpm-2`](https://github.com/markshust/docker-magento/tree/master/images/php/7.2)
+      - [`latest`, `7.2-fpm`, `7.2-fpm-3`](https://github.com/markshust/docker-magento/tree/master/images/php/7.2)
+      - [`7.2-fpm-2`](https://github.com/markshust/docker-magento/tree/23.2.1/images/php/7.2)
       - [`7.2-fpm-1`](https://github.com/markshust/docker-magento/tree/23.1.1/images/php/7.2)
       - [`7.2-fpm-0`](https://github.com/markshust/docker-magento/tree/23.0.0/images/php/7.2)
   - 7.1
-      - [`7.1-fpm`, `7.1-fpm-11`](https://github.com/markshust/docker-magento/tree/master/images/php/7.1)
+      - [`7.1-fpm`, `7.1-fpm-12`](https://github.com/markshust/docker-magento/tree/master/images/php/7.1)
+      - [`7.1-fpm-11`](https://github.com/markshust/docker-magento/tree/23.2.1/images/php/7.1)
       - [`7.1-fpm-10`](https://github.com/markshust/docker-magento/tree/23.1.1/images/php/7.1)
       - [`7.1-fpm-9`](https://github.com/markshust/docker-magento/tree/23.0.0/images/php/7.1)
       - [`7.1-fpm-8`](https://github.com/markshust/docker-magento/tree/17.0.1/images/php/7.1)

+ 5 - 2
compose/magento-2/.vscode/launch.json

@@ -6,9 +6,12 @@
       "type": "php",
       "request": "launch",
       "pathMappings": {
-        "/var/www/html": "${workspaceFolder}/src"
+        "/var/www/html": "${workspaceFolder}"
       },
-      "port": 9001
+      "port": 9001,
+      "xdebugSettings": {
+        "idekey": "VSCODE"
+      }
     }
   ]
 }

+ 1 - 1
compose/magento-2/docker-compose.dev.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markshust/docker-magento)
-# Version 23.2.1
+# Version 23.2.2
 
 version: "3"
 

+ 3 - 3
compose/magento-2/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markshust/docker-magento)
-# Version 23.2.1
+# Version 23.2.2
 
 version: "3"
 
@@ -18,7 +18,7 @@ services:
       - sockdata:/sock
 
   phpfpm:
-    image: markoshust/magento-php:7.2-fpm-2
+    image: markoshust/magento-php:7.2-fpm-3
     links:
       - db
     volumes: *appvolumes
@@ -42,7 +42,7 @@ services:
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
-  #  image: markoshust/magento-php:7.2-fpm-2
+  #  image: markoshust/magento-php:7.2-fpm-3
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  tty: true

+ 1 - 0
images/php/7.1/conf/php.ini

@@ -8,6 +8,7 @@ xdebug.remote_autostart = 1
 xdebug.remote_enable = 1
 xdebug.remote_host = host.docker.internal
 xdebug.remote_port = 9001
+xdebug.idekey = PHPSTORM
 
 upload_max_filesize = 20M
 post_max_size = 20M

+ 1 - 0
images/php/7.2/conf/php.ini

@@ -8,6 +8,7 @@ xdebug.remote_autostart = 1
 xdebug.remote_enable = 1
 xdebug.remote_host = host.docker.internal
 xdebug.remote_port = 9001
+xdebug.idekey = PHPSTORM
 
 upload_max_filesize = 20M
 post_max_size = 20M