Merge pull request #13 from vfalies/dev

3.1

Author: Vincent Faliès

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.1]
+
+### Added
+
+- Add Redis admin tools
+- Add XDebug configuration & profiler directory
+
+### Changed
+
+- Fix wrapper php & composer
+- Update EnvdevHome version
+
 ## [3.0]
 
 ### Added

conf/php/php.ini

@@ -7,4 +7,14 @@ memory_limit = -1
 upload_max_filesize = 200M
 post_max_size = 50M
 SMTP=maildev
-smtp_port=25
+smtp_port=25
+
+#XDebug configuration
+xdebug.remote_connect_back=1
+xdebug.idekey=VSCODE
+xdebug.remote_autostart=0
+
+xdebug.profiler_enable_trigger = 1
+xdebug.profiler_enable = 0
+xdebug.profiler_output_dir = "/outputs/profiler" # Remote path
+xdebug.profiler_output_name=cachegrind.out.%R # To specify witch query is the origin

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.6"
 services:
 
   home:
-    image: vfac/envdevhome:1.1
+    image: vfac/envdevhome:1.2
     container_name: home
     env_file: .env
     volumes:
@@ -30,13 +30,13 @@ services:
       - ${PROJECTS_PATH}:${PROJECTS_PATH_DEST}
       - ./tools/phpinfo:/var/www/html/phpinfo
       - ./conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ./outputs/profiler:/outputs/profiler
       - ~/.gitconfig:/root/.gitconfig
       - ~/.gitconfig:/home/vfac/.gitconfig
       - ~/.ssh:/root/.ssh
       - ~/.ssh:/home/vfac/.ssh
     user: "${USER_ID}:${GROUP_ID}"
     ports:
-      - '9000:9000'
       - '22:22'
 
     working_dir: ${PROJECTS_PATH_DEST}

environments/redis.env

@@ -2,6 +2,8 @@
 # Cache version
 CACHE_VERSION=5.0-alpine
 # Cache port
-CACHE_PORT=6380
+CACHE_PORT=6379
 CACHE_STATIC_IP=172.16.238.15
 CACHE_SERVER=redis
+CACHEADMIN_STATIC_IP=172.16.238.19
+CACHEADMIN_PORT=8082

services/redis.yml

@@ -3,11 +3,27 @@ services:
   cache:
     image: redis:${CACHE_VERSION}
     ports:
-      - ${CACHE_PORT}:6379
+      - 6379:6379
     container_name: cache
     links:
       - base:base
       - home:home
     networks:
       vfac:
         ipv4_address: ${CACHE_STATIC_IP}
+
+  redis-commander:
+    container_name: redis-commander
+    hostname: redis-commander
+    image: rediscommander/redis-commander:latest
+    restart: always
+    depends_on:
+      - cache
+    environment:
+      - REDIS_HOSTS=local:${CACHE_STATIC_IP}:6379
+    ports:
+      - '${CACHEADMIN_PORT}:8081'
+    networks:
+      vfac:
+        ipv4_address: ${CACHEADMIN_STATIC_IP}
+

version

@@ -1 +1 @@
-3.0
+3.1

wrappers/composer

@@ -14,7 +14,7 @@ docker run \
     -v $(realpath ~/.ssh):"/home/vfac/.ssh" \
     -w $PWD \
     -u $USER_ID:$GROUP_ID \
-    vfac/envdevjs:${PHP_VERSION} \
+    vfac/envdevjs:${BASE_VERSION} \
     composer "$@"
 
 exit $?

wrappers/php

@@ -8,7 +8,7 @@ docker run \
     -i \
     --network=host \
     -v "$PWD":"$PWD":ro \
-    vfac/envdevjs:${PHP_VERSION} \
+    vfac/envdevjs:${BASE_VERSION} \
     php "$@"
 
 exit $?