Phras 2836 xdebug

.circleci/config.yml

@@ -27,15 +27,5 @@ jobs:
       - run:
           name: Reset docker stack
           command: |-
-            docker-compose down
-            docker volume rm "${COMPOSE_PROJECT_NAME}_alchemy_vol" || true
-            docker volume rm "${COMPOSE_PROJECT_NAME}_data_vol" || true
-            docker volume rm "${COMPOSE_PROJECT_NAME}_db_vol" || true
-            docker volume rm "${COMPOSE_PROJECT_NAME}_dev_vol" || true
-            docker volume rm "${COMPOSE_PROJECT_NAME}_elasticsearch_vol" || true
-      - run:
-          name: Build application Docker image
-          command: |-
-            # Avoid volume creation with local binding (Docker is run on remote host on CircleCI):
-            docker volume create --name "${COMPOSE_PROJECT_NAME}_alchemy_vol"
-            bin/install.sh
+            cp env.dist .env
+            docker-compose build

docker-compose.override.yml

@@ -1,4 +1,10 @@
 version: "3.4"
+networks:
+  default:
+    ipam:
+      config:
+        - subnet: $SUBNET_IPS
+
 services:
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
@@ -13,10 +19,19 @@ services:
         - alchemy_vol:/var/alchemy/Phraseanet
 
   phraseanet:
+    image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-fpm-xdebug:$PHRASEANET_DOCKER_TAG
+    ports:
+    - $XDEBUG_PHRASEANET_PORT:9000
     volumes:
       - alchemy_vol:/var/alchemy/Phraseanet
+    environment:
+    - XDEBUG_CONFIG=remote_enable=1 remote_host=${GATEWAY_IP} idekey=PHPSTORM
+    - XDEBUG_REMOTE_HOST=${GATEWAY_IP}
 
   worker:
+    image: $PHRASEANET_DOCKER_REGISTRY/phraseanet-worker-xdebug:$PHRASEANET_DOCKER_TAG
+    ports:
+    - $XDEBUG_WORKER_PORT:9000
     volumes:
       - alchemy_vol:/var/alchemy/Phraseanet
 

env.dist

@@ -59,3 +59,9 @@ MYSQL_MAX_ALLOWED_PACKET=16M
 ALCHEMY_WORKSPACE_DIR=/var/alchemy
 # PhpMyAdmin port
 PHPMYADMIN_PORT=8089
+
+XDEBUG_PHRASEANET_PORT=9001
+XDEBUG_WORKER_PORT=9002
+
+SUBNET_IPS=172.31.200.0/16
+GATEWAY_IP=172.31.200.1