Update Docker stack

README.md

@@ -16,9 +16,9 @@ cd validata-docker/development
 docker-compose up -d
 ```
 
-This will bring up both Validata UI (`http://localhost:5000`) and Validata Web API (`http://localhost:5001`).
+This will bring up both Validata UI (http://localhost:5000/) and Validata Web API (http://localhost:5001/).
 
-Configuration is done by editing environment variables of [./development/docker-compose.yml](development/docker-compose.yml).
+Configuration is done by editing environment variables in [api.env](./development/api.env) and [ui.env](./development/ui.env). Warning: Docker env files do not support using quotes around variable values!
 
 ## Deploy to production
 

development/api.env

+BADGE_CONFIG_URL=https://git.opendatafrance.net/validata/validata-badge/raw/master/badge_conf.toml
+SECRET_KEY=dev
\ No newline at end of file

development/docker-compose.yml

@@ -4,21 +4,19 @@ services:
   api:
     build:
       context: ../../validata-api
+    image: validata-api
+    container_name: validata-api
     ports:
       - 5001:5000
-    environment:
-      BADGE_CONFIG_URL: https://git.opendatafrance.net/validata/validata-badge/raw/master/badge_conf.toml
-      SECRET_KEY: dev
+    env_file: ./api.env
 
   ui:
     build:
       context: ../../validata-ui
+    image: validata-ui
+    container_name: validata-ui
     ports:
       - 5000:5000
     links:
       - api
-    environment:
-      API_VALIDATE_ENDPOINT: http://api:5000/validate
-      HOMEPAGE_CONFIG_FILE: homepage_config.json.example
-      SECRET_KEY: dev
-      SHIELDS_IO_BASE_URL: https://img.shields.io/
+    env_file: ./ui.env
\ No newline at end of file

development/ui.env

+API_VALIDATE_ENDPOINT=http://api:5000/validate
+HOMEPAGE_CONFIG_FILE=homepage_config.json.example
+SECRET_KEY=dev
+SHIELDS_IO_BASE_URL=https://img.shields.io/
\ No newline at end of file