From f0a29f2e7714088e64b85d097c95ff4393870c53 Mon Sep 17 00:00:00 2001 From: Vincent Jumo Date: Sat, 21 Jul 2018 13:22:41 +0200 Subject: [PATCH] update config and readme --- README.md | 13 ++----------- docker-compose.yml | 2 ++ utils/config/entities-search-engine-local.coffee | 2 ++ .../{local.coffee => inventaire-local.coffee} | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 utils/config/entities-search-engine-local.coffee rename utils/config/{local.coffee => inventaire-local.coffee} (93%) diff --git a/README.md b/README.md index 33da845..cebebbe 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,8 @@ Run your own inventaire in a docker environment - [docker-compose](https://docs.docker.com/compose/gettingstarted/) up and ready - git - ## Install -Clone this repo - ``` git clone https://github.com/inventaire/inventaire-docker.git ``` @@ -18,20 +15,14 @@ got to `cd inventaire-docker` clone the two repos inventaire needs to run : - - `inventaire` -> [setup](https://github.com/inventaire/inventaire#installation) - - `entities-search-engine` -> [go to repo](https://github.com/inventaire/entities-search-engine) + - `inventaire` core application server -> [setup](https://github.com/inventaire/inventaire#installation) + - `entities-search-engine` for querying entities -> [go to repo](https://github.com/inventaire/entities-search-engine) ``` git clone https://github.com/inventaire/inventaire.git git clone https://github.com/inventaire/entities-search-engine.git ``` -Copy docker utils files into inventaire folder if necessary - -``` -cp (or ln) utils/config/local.coffee inventaire/config/local.coffee -``` - Start the magic, build everything at once ! ``` diff --git a/docker-compose.yml b/docker-compose.yml index 264d20c..cf0c317 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: - "3006:3006" volumes: - ./inventaire:/opt/inventaire + - ./utils/config/inventaire-local.coffee:/opt/inventaire/config/local.coffee links: - couch working_dir: /opt/inventaire @@ -33,6 +34,7 @@ services: - "3213:3213" volumes: - ./entities-search-engine:/opt/entities-search-engine + - ./utils/config/entities-search-engine-local.coffee:/opt/entities-search-engine/config/local.coffee links: - couch working_dir: /opt/entities-search-engine diff --git a/utils/config/entities-search-engine-local.coffee b/utils/config/entities-search-engine-local.coffee new file mode 100644 index 0000000..2b7f812 --- /dev/null +++ b/utils/config/entities-search-engine-local.coffee @@ -0,0 +1,2 @@ +elastic: + host: 'http://elasticsearch:9200' diff --git a/utils/config/local.coffee b/utils/config/inventaire-local.coffee similarity index 93% rename from utils/config/local.coffee rename to utils/config/inventaire-local.coffee index abcce2d..041f78e 100755 --- a/utils/config/local.coffee +++ b/utils/config/inventaire-local.coffee @@ -1,7 +1,7 @@ module.exports = host: '0.0.0.0' elasticsearch: - host: '0.0.0.0' + host: 'elasticsearch' port: '9200' db: protocol: 'http'