Merge remote-tracking branch 'origin/develop' for release 0.1.0-beta7

wardenenv · Jun 26, 2019 · 422cc86 · 422cc86
2 parents a7b416d + a838a2d
commit 422cc86
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.1.0-beta7
+===============
+
+* Added Xdebug support via additional `php-debug` container which Nginx routes to based on presence of `XDEBUG_SESSION` cookie.
+* Fixed Elasticsearch images used in Magento 2 environment templates and configured for lower overall memory utilization upon container start for a smaller env footprint.
+
 0.1.0-beta6
 ===============
 

diff --git a/commands/usage.help b/commands/usage.help
@@ -11,7 +11,7 @@ WARDEN_HEADER='
 
 WARDEN_USAGE=$(cat <<EOF
 ${WARDEN_HEADER:1}
-Warden version 0.1.0-beta6
+Warden version 0.1.0-beta7
 
 \033[33mUsage:\033[0m
   command [options] [arguments]

diff --git a/environments/magento1.yml b/environments/magento1.yml
@@ -7,6 +7,7 @@ services:
     image: davidalger/warden:nginx-${NGINX_VERSION:-1.16}-alpine
     environment:
       - NGINX_TEMPLATE=magento1.conf
+      - XDEBUG_CONNECT_BACK_HOST=${XDEBUG_CONNECT_BACK_HOST:-host.docker.internal}
     depends_on:
       - db
       - php-fpm
@@ -29,6 +30,17 @@ services:
       - ~/.composer:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
 
+  php-debug:
+    hostname: php-debug
+    image: davidalger/warden:mage1-fpm-${PHP_VERSION:-7.2}-debug-alpine
+    environment:
+      - PHP_IDE_CONFIG=serverName=${WARDEN_ENV_NAME}-docker
+    depends_on:
+      - db
+    volumes:
+      - ~/.composer:/home/www-data/.composer:delegated
+      - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
+
   db:
     hostname: mariadb
     image: mariadb:${MARIADB_VERSION:-10.3}

diff --git a/environments/magento2-mutagen.yml b/environments/magento2-mutagen.yml
@@ -5,6 +5,8 @@ services:
   nginx:
     hostname: nginx
     image: davidalger/warden:nginx-${NGINX_VERSION:-1.16}-alpine
+    environment:
+      - XDEBUG_CONNECT_BACK_HOST=${XDEBUG_CONNECT_BACK_HOST:-host.docker.internal}
     depends_on:
       - db
       - php-fpm
@@ -34,6 +36,18 @@ services:
       - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
       - appdata:/var/www/html
 
+  php-debug:
+    hostname: php-debug
+    image: davidalger/warden:mage2-fpm-${PHP_VERSION:-7.2}-debug-alpine
+    environment:
+      - PHP_IDE_CONFIG=serverName=${WARDEN_ENV_NAME}-docker
+    depends_on:
+      - db
+    volumes:
+      - ~/.composer:/home/www-data/.composer:delegated
+      - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
+      - appdata:/var/www/html
+
   db:
     hostname: mariadb
     image: mariadb:${MARIADB_VERSION:-10.3}
@@ -50,11 +64,15 @@ services:
 
   elasticsearch:
     hostname: elasticsearch
-    image: davidalger/warden:elasticsearch-${ELASTICSEARCH_VERSION:-5.6}-alpine
+    image: davidalger/warden:elasticsearch-${ELASTICSEARCH_VERSION:-5.6}
     labels:
       - traefik.enable=true
       - traefik.port=9200
       - traefik.frontend.rule=Host:elasticsearch.${TRAEFIK_DOMAIN}
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - "ES_JAVA_OPTS=-Xms64m -Xmx512m"
     volumes:
       - esdata:/usr/share/elasticsearch/data
     networks:

diff --git a/environments/magento2-native.yml b/environments/magento2-native.yml
@@ -32,6 +32,17 @@ services:
       - ~/.composer:/home/www-data/.composer:delegated
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
 
+  php-debug:
+    hostname: php-debug
+    image: davidalger/warden:mage2-fpm-${PHP_VERSION:-7.2}-debug-alpine
+    environment:
+      - PHP_IDE_CONFIG=serverName=${WARDEN_ENV_NAME}-docker
+    depends_on:
+      - db
+    volumes:
+      - ~/.composer:/home/www-data/.composer:delegated
+      - .${WARDEN_WEB_ROOT:-}/:/var/www/html:delegated
+
   db:
     hostname: mariadb
     image: mariadb:${MARIADB_VERSION:-10.3}
@@ -48,11 +59,15 @@ services:
 
   elasticsearch:
     hostname: elasticsearch
-    image: mage2click/magento-elasticsearch:${ELASTICSEARCH_VERSION:-5.6}
+    image: davidalger/warden:elasticsearch-${ELASTICSEARCH_VERSION:-5.6}
     labels:
       - traefik.enable=true
       - traefik.port=9200
       - traefik.frontend.rule=Host:elasticsearch.${TRAEFIK_DOMAIN}
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - "ES_JAVA_OPTS=-Xms64m -Xmx512m"
     volumes:
       - esdata:/usr/share/elasticsearch/data
     networks: