use custom volumes in docker-compose.override

This commit is contained in:
Arthur de Moulins
2020-02-28 17:00:31 +01:00
parent 4a634070d1
commit 090ff844e3
5 changed files with 34 additions and 17 deletions

View File

@@ -26,6 +26,7 @@
/plugins /plugins
/tmp /tmp
/vendor /vendor
/volumes
/www/assets /www/assets
/www/custom /www/custom
/www/plugins /www/plugins

8
.env
View File

@@ -61,3 +61,11 @@ IDE_KEY=PHPSTORM
PHRASEANET_SUBNET_IPS=172.32.0.0/16 PHRASEANET_SUBNET_IPS=172.32.0.0/16
PHRASEANET_GATEWAY_IP=172.32.0.1 PHRASEANET_GATEWAY_IP=172.32.0.1
PHP_IDE_CONFIG=serverName=docker-server-phraseanet PHP_IDE_CONFIG=serverName=docker-server-phraseanet
# Volumes location for dev
PHRASEANET_CONFIG_DIR=./config
PHRASEANET_LOGS_DIR=./logs
PHRASEANET_DATA_DIR=./datas
PHRASEANET_DB_DIR=./volumes/db
PHRASEANET_ELASTICSEARCH_DIR=./volumes/elasticsearch
PHRASEANET_THUMBNAILS_DIR=./www/thumbnails

2
.gitignore vendored
View File

@@ -73,3 +73,5 @@ npm-debug.log
/Phrasea_datas /Phrasea_datas
.env.* .env.*
env.local
/volumes

View File

@@ -52,14 +52,14 @@ export INSTALL_ACCOUNT_PASSWORD=$3cr3t!
export PHRASEANET_APP_PORT=8082 export PHRASEANET_APP_PORT=8082
``` ```
### Using a .env.local ### Using a env.local (custom .env)
It may be easier to deal with a local file to manage our env variables. It may be easier to deal with a local file to manage our env variables.
You can add your `.env.local` at the root of this project and define a command alias in your `~/.bashrc`: You can add your `env.local` at the root of this project and define a command alias in your `~/.bashrc`:
```bash ```bash
alias dc="env $(cat .env.local | grep -v '#' | tr '\n' ' ') docker-compose" alias dc="env $(cat env.local | grep -v '#' | tr '\n' ' ') docker-compose"
``` ```
### Running the application ### Running the application

View File

@@ -11,9 +11,9 @@ services:
gateway: gateway:
volumes: volumes:
- .:/var/alchemy/Phraseanet - .:/var/alchemy/Phraseanet
- ./datas:/var/alchemy/Phraseanet/datas:rw
- ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw
- ./docker/nginx/root/entrypoint.sh:/entrypoint.sh - ./docker/nginx/root/entrypoint.sh:/entrypoint.sh
- ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
- ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
builder: builder:
build: build:
@@ -22,10 +22,10 @@ services:
command: exit 0 command: exit 0
volumes: volumes:
- .:/var/alchemy/Phraseanet - .:/var/alchemy/Phraseanet
- ./config:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ./logs:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
- ./datas:/var/alchemy/Phraseanet/datas:rw - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
- ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
phraseanet: phraseanet:
environment: environment:
@@ -34,23 +34,27 @@ services:
- PHP_IDE_CONFIG - PHP_IDE_CONFIG
volumes: volumes:
- .:/var/alchemy/Phraseanet - .:/var/alchemy/Phraseanet
- ./config:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ./logs:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
- ./datas:/var/alchemy/Phraseanet/datas:rw - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
- ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
worker: worker:
volumes: volumes:
- .:/var/alchemy/Phraseanet - .:/var/alchemy/Phraseanet
- ./config:/var/alchemy/Phraseanet/config:rw - ${PHRASEANET_CONFIG_DIR}:/var/alchemy/Phraseanet/config:rw
- ./logs:/var/alchemy/Phraseanet/logs:rw - ${PHRASEANET_LOGS_DIR}:/var/alchemy/Phraseanet/logs:rw
- ./datas:/var/alchemy/Phraseanet/datas:rw - ${PHRASEANET_DATA_DIR}:/var/alchemy/Phraseanet/datas:rw
- ./www/thumbnails:/var/alchemy/Phraseanet/www/thumbnails:rw - ${PHRASEANET_THUMBNAILS_DIR}:/var/alchemy/Phraseanet/www/thumbnails:rw
rabbitmq: rabbitmq:
ports: ports:
- ${RABBITMQ_MANAGEMENT_PORT}:15672 - ${RABBITMQ_MANAGEMENT_PORT}:15672
db:
volumes:
- ${PHRASEANET_DB_DIR}:/var/lib/mysql:rw
mailhog: mailhog:
image: mailhog/mailhog image: mailhog/mailhog
ports: ports:
@@ -60,6 +64,8 @@ services:
elasticsearch: elasticsearch:
ports: ports:
- 9200:9200 - 9200:9200
volumes:
- ${PHRASEANET_ELASTICSEARCH_DIR}:/usr/share/elasticsearch/data:rw
networks: networks:
default: default: