From 93580efc71563ea81d14fd41bebe439077b1f490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Thu, 27 Jul 2017 13:27:51 +0200 Subject: [PATCH] [Docker] Swithc to dev by default now that we have :cached folders --- .env | 3 +-- doc/docker/README.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 4b8928171e..42a44fd6fd 100644 --- a/.env +++ b/.env @@ -1,6 +1,5 @@ # Allows us to set default values of env variables, see: https://docs.docker.com/compose/env-file/ -# On v1.7.0 file separator if defining several is different from Win and nix, so we just use one for default prod setup -COMPOSE_FILE=doc/docker/base-prod.yml +COMPOSE_FILE=doc/docker/base-dev.yml COMPOSE_DIR=. # You'll need to adjust this for Windows and XDB Linux systems: https://getcomposer.org/doc/03-cli.md#composer-home diff --git a/doc/docker/README.md b/doc/docker/README.md index 797ed8e0fd..7315fcbbbd 100644 --- a/doc/docker/README.md +++ b/doc/docker/README.md @@ -51,6 +51,8 @@ However below environment variable `COMPOSE_FILE` is used instead since this is From root of your projects clone of this distribution, [setup composer auth.json](#composer) and execute the following: ```sh +export COMPOSE_FILE=doc/docker/base-prod.yml + # Optional step if you'd like to use blackfire with the setup, change and with your own values #export COMPOSE_FILE=doc/docker/base-prod.yml:doc/docker/blackfire.yml BLACKFIRE_SERVER_ID= BLACKFIRE_SERVER_TOKEN= @@ -71,8 +73,6 @@ by default under the hood, which leads to much slower IO performance.* From root of your projects clone of this distribution, [setup composer auth.json](#composer) and execute the following: ```sh -export COMPOSE_FILE=doc/docker/base-dev.yml - # Optional: If you use Docker Machine with NFS, you'll need to specify where project is, & give composer a valid directory. #export COMPOSE_DIR=/data/SOURCES/MYPROJECTS/ezplatform/doc/docker COMPOSER_HOME=/tmp