Skip to content

Commit

Permalink
[Docker] Swithc to dev by default now that we have :cached folders
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Jul 27, 2017
1 parent edde653 commit 93580ef
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <id> and <token> with your own values
#export COMPOSE_FILE=doc/docker/base-prod.yml:doc/docker/blackfire.yml BLACKFIRE_SERVER_ID=<id> BLACKFIRE_SERVER_TOKEN=<token>

Expand All @@ -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

Expand Down

0 comments on commit 93580ef

Please sign in to comment.