Local .env logic for webpack custom port

merge-requests/154/head
Eliot Berriot 2018-03-29 19:55:24 +02:00
rodzic 75710638de
commit 96d219dfe2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DD6965E2476E5C27
4 zmienionych plików z 36 dodań i 10 usunięć

1
.gitignore vendored
Wyświetl plik

@ -86,3 +86,4 @@ front/selenium-debug.log
docs/_build docs/_build
data/ data/
.env

Wyświetl plik

@ -73,6 +73,19 @@ via the following command::
docker-compose -f dev.yml build docker-compose -f dev.yml build
Creating your env file
^^^^^^^^^^^^^^^^^^^^^^
We provide a working .env.dev configuration file that is suitable for
development. However, to enable customization on your machine, you should
also create a .env file that will hold your personal environment
variables (those will not be commited to the project).
Create it like this::
touch .env
Database management Database management
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^

30
dev.yml
Wyświetl plik

@ -1,27 +1,35 @@
version: '2' version: '3'
services: services:
front: front:
build: front build: front
env_file: .env.dev env_file:
- .env.dev
- .env
environment: environment:
- "HOST=0.0.0.0" - "HOST=0.0.0.0"
- "WEBPACK_DEVSERVER_PORT=${WEBPACK_DEVSERVER_PORT-8080}"
ports: ports:
- "8080:8080" - "${WEBPACK_DEVSERVER_PORT-8080}:${WEBPACK_DEVSERVER_PORT-8080}"
volumes: volumes:
- './front:/app' - './front:/app'
postgres: postgres:
env_file: .env.dev env_file:
- .env.dev
- .env
image: postgres image: postgres
redis: redis:
env_file: .env.dev env_file:
- .env.dev
- .env
image: redis:3.0 image: redis:3.0
celeryworker: celeryworker:
env_file: .env.dev env_file:
- .env.dev
- .env
build: build:
context: ./api context: ./api
dockerfile: docker/Dockerfile.test dockerfile: docker/Dockerfile.test
@ -41,7 +49,9 @@ services:
- ./api:/app - ./api:/app
- ./data/music:/music - ./data/music:/music
api: api:
env_file: .env.dev env_file:
- .env.dev
- .env
build: build:
context: ./api context: ./api
dockerfile: docker/Dockerfile.test dockerfile: docker/Dockerfile.test
@ -62,7 +72,9 @@ services:
- redis - redis
nginx: nginx:
env_file: .env.dev env_file:
- .env.dev
- .env
image: nginx image: nginx
links: links:
- api - api

Wyświetl plik

@ -23,7 +23,7 @@ module.exports = {
}, },
dev: { dev: {
env: require('./dev.env'), env: require('./dev.env'),
port: 8080, port: parseInt(process.env.WEBPACK_DEVSERVER_PORT),
host: '127.0.0.1', host: '127.0.0.1',
autoOpenBrowser: true, autoOpenBrowser: true,
assetsSubDirectory: 'static', assetsSubDirectory: 'static',