ソースを参照

add xdebug to the php docker

olivier.massot 5 年 前
コミット
e6b6cc0910
6 ファイル変更32 行追加63 行削除
  1. 0 49
      .env
  2. 1 1
      README
  3. 13 11
      docker-compose.yaml
  4. 1 1
      docker/mariaDb/Dockerfile
  5. 10 1
      docker/php/Dockerfile
  6. 7 0
      docker/php/conf/xdebug.ini

+ 0 - 49
.env

@@ -1,49 +0,0 @@
-#OS : MAC ou LINUX
-OS=MAC
-
-#Composer hash for instal (check validity here : https://getcomposer.org/download/)
-COMPOSER_HASH=baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182
-
-#LetsEncrypt
-EMAIL=vincent.guffon@2iopenservice.com
-
-#DataBase
-MYSQL_PASS=mysql660
-
-#Elasticsearch
-ES_VIRTUAL_HOST=local.elasticsearch.opentalent.fr
-ES_PORT=9200
-
-#API
-API_VIRTUAL_HOST=local.api.opentalent.fr
-
-#ADMIN
-ADMIN_VIRTUAL_HOST=local.admin.opentalent.fr
-ADMIN_PORT=3000
-ADMIN_REPORT_PORT=3001
-
-#PORTAIL
-PORTAIL_VIRTUAL_HOST=local.opentalent.fr
-
-#V59
-V59_VIRTUAL_HOST=local.v59.opentalent.fr
-
-#PHPMYADMIN
-PHPMYADMIN_VIRTUAL_HOST=local.phpmyadmin.opentalent.fr
-
-#MAILCATCHER
-MAILCATCHER_VIRTUAL_HOST=local.mailcatcher.opentalent.fr
-MAILCATCHER_PORT=1080
-
-#THUMBOR
-THUMBOR_VIRTUAL_HOST=local.thumbor.opentalent.fr
-
-#Black Fire
-BLACK_FIRE_ID=97e9ee98-0703-478e-a298-6320bd432393
-BLACK_FIRE_TOKEN=31c026c1ee937f59834cec4da0d019d946ce3e3dd02119ab621e59d1b52a20e9
-BLACK_FIRE_VIRTUAL_HOST=local.blackfire.opentalent.fr
-BLACK_FIRE_PORT=8707
-
-#Metabase
-METABASE_VIRTUAL_HOST=local.metabase.opentalent.fr
-METABASE_PORT=3000

+ 1 - 1
README

@@ -46,7 +46,7 @@ docker exec -it mariaDb bash
 
 //Récupérer les BDDs via un synchro.sh
 // !!!! Pensez à adapter le commonvar_local suivant les synchros voulues !!!!!
-cd env
+cd /env
 ./synchro.sh -d -n opentalent
 ./synchro.sh -d -n adminassos
 ./synchro.sh -d -n crm

+ 13 - 11
docker-compose.yaml

@@ -77,6 +77,8 @@ services:
         - COMPOSER_HASH=${COMPOSER_HASH}
         - OS=${OS}
     restart: always
+    environment:
+      - PHP_IDE_CONFIG=servername=api
     volumes:
       # Version Symfony 2
       - appdata:/var/www/html/app/cache/
@@ -176,17 +178,17 @@ services:
     depends_on:
       - nginx-proxy
 
-  blackfire:
-    container_name: blackfire
-    image: blackfire/blackfire
-    environment:
-      # Exposes the host BLACKFIRE_SERVER_ID and TOKEN environment variables.
-      - ${BLACK_FIRE_ID}
-      - ${BLACK_FIRE_TOKEN}
-      - VIRTUAL_HOST=${BLACK_FIRE_VIRTUAL_HOST}
-      - VIRTUAL_PORT=${BLACK_FIRE_PORT}
-    depends_on:
-      - php
+  #blackfire:
+  #  container_name: blackfire
+  #  image: blackfire/blackfire
+  #  environment:
+  #    # Exposes the host BLACKFIRE_SERVER_ID and TOKEN environment variables.
+  #    - ${BLACK_FIRE_ID}
+  #    - ${BLACK_FIRE_TOKEN}
+  #    - VIRTUAL_HOST=${BLACK_FIRE_VIRTUAL_HOST}
+  #    - VIRTUAL_PORT=${BLACK_FIRE_PORT}
+  #  depends_on:
+  #    - php
 
   metabase:
     image: metabase/metabase

+ 1 - 1
docker/mariaDb/Dockerfile

@@ -7,4 +7,4 @@ RUN apt-get update; \
 COPY /.ssh /root/.ssh
 COPY /docker/mariaDb/conf/my.cnf /etc/mysql/conf.d/
 
-WORKDIR /usr/src
+WORKDIR /usr/src

+ 10 - 1
docker/php/Dockerfile

@@ -54,10 +54,19 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;"); \
     rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz;
 ########   BLACKFIRE #########
 
+######## XDebug ########
+RUN pecl install xdebug-2.7.2; \
+    docker-php-ext-enable xdebug;
+
+######## Php conf ########
+
 COPY /.ssh /root/.ssh
 COPY /docker/php/conf/memory.ini /usr/local/etc/php/conf.d
 COPY /docker/php/conf/apc.ini /usr/local/etc/php/conf.d
 COPY /docker/php/conf/execution_time.ini /usr/local/etc/php/conf.d
+COPY /docker/php/conf/xdebug.ini /usr/local/etc/php/conf.d
+
+######## FACL and Start ########
 
 WORKDIR /var/www/html
 
@@ -69,4 +78,4 @@ CMD if [ "x$OS" = "MAC" ] ; then HTTPDUSER=$(ps axo user,comm | grep -E '[a]pach
     setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs && setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs;\
     chown -R www-data:www-data /var/www/html/web; \
     php-fpm; \
-    fi;
+    fi;

+ 7 - 0
docker/php/conf/xdebug.ini

@@ -0,0 +1,7 @@
+[xdebug]
+xdebug.remote_enable = 1
+xdebug.remote_autostart = 1
+xdebug.remote_connect_back = 0
+xdebug.remote_host = host.docker.internal
+xdebug.remote_host = dev
+xdebug.idekey=PHPSTORM