Add Redis support

nicobatty · Oct 18, 2017 · 588dae2 · 588dae2
1 parent d036aa9
commit 588dae2
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/7.0-cli/bin/magento-installer b/7.0-cli/bin/magento-installer
@@ -70,8 +70,16 @@ if [ ! "$M2SETUP_INSTALL_DB" = "false" ]; then
     fi
 
     $INSTALL_COMMAND
+    $MAGENTO_COMMAND setup:config:set -n \
+        --cache-backend=$M2SETUP_REDIS_HOST \
+        --cache-backend-redis-server=$M2SETUP_REDIS_HOST \
+        --session-save=$M2SETUP_REDIS_HOST \
+        --session-save-redis-host=$M2SETUP_REDIS_HOST
     $MAGENTO_COMMAND index:reindex
-    $MAGENTO_COMMAND setup:static-content:deploy
+
+    if [ "MAGENTO_RUN_MODE" = "production" ]; then
+        $MAGENTO_COMMAND setup:static-content:deploy
+    fi
 
 else
     echo "Skipping DB installation"

diff --git a/7.1-cli/bin/magento-installer b/7.1-cli/bin/magento-installer
@@ -70,8 +70,16 @@ if [ ! "$M2SETUP_INSTALL_DB" = "false" ]; then
     fi
 
     $INSTALL_COMMAND
+    $MAGENTO_COMMAND setup:config:set -n \
+        --cache-backend=$M2SETUP_REDIS_HOST \
+        --cache-backend-redis-server=$M2SETUP_REDIS_HOST \
+        --session-save=$M2SETUP_REDIS_HOST \
+        --session-save-redis-host=$M2SETUP_REDIS_HOST
     $MAGENTO_COMMAND index:reindex
-    $MAGENTO_COMMAND setup:static-content:deploy
+
+    if [ "MAGENTO_RUN_MODE" = "production" ]; then
+        $MAGENTO_COMMAND setup:static-content:deploy
+    fi
 
 else
     echo "Skipping DB installation"

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -37,6 +37,7 @@ services:
       - 9000
     links:
       - db
+      - redis
     volumes_from:
       - appdata
     env_file:
@@ -54,12 +55,18 @@ services:
       - MYSQL_USER=magento2
       - MYSQL_PASSWORD=magento2
 
+  redis:
+      image: redis:4
+      ports:
+        - 6379
+
   cli:
     hostname: cli.magento2.docker
     build:
       context: 7.1-cli/
     links:
       - db
+      - redis
     volumes:
       - ~/.composer/cache:/root/.composer/cache
     volumes_from:
@@ -82,6 +89,7 @@ services:
       - M2SETUP_ADMIN_USER=admin
       - M2SETUP_ADMIN_PASSWORD=password1
       - M2SETUP_VERSION=2.2.*
+      - M2SETUP_REDIS_HOST=redis
       # - M2SETUP_USE_SAMPLE_DATA=true
 
   cron:
@@ -97,6 +105,7 @@ services:
       - appdata
     links:
       - db
+      - redis
 
   appdata:
     image: tianon/true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,6 +34,7 @@ services:
       - 9000
     links:
       - db
+      - redis
     volumes_from:
       - appdata
     env_file:
@@ -51,11 +52,17 @@ services:
       - MYSQL_USER=magento2
       - MYSQL_PASSWORD=magento2
 
+  redis:
+      image: redis:4
+      ports:
+        - 6379
+
   cli:
     hostname: cli.magento2.docker
     image: meanbee/magento2-php:7.1-cli
     links:
       - db
+      - redis
     volumes:
       - ~/.composer/cache:/root/.composer/cache
     volumes_from:
@@ -78,6 +85,7 @@ services:
       - M2SETUP_ADMIN_USER=admin
       - M2SETUP_ADMIN_PASSWORD=password1
       - M2SETUP_VERSION=2.2.*
+      - M2SETUP_REDIS_HOST=redis
       # - M2SETUP_USE_SAMPLE_DATA=true
 
   cron:
@@ -92,6 +100,7 @@ services:
       - appdata
     links:
       - db
+      - redis
 
   appdata:
     image: tianon/true