From 4ac8128eb7406771566c1f58ce5bdb7998245b19 Mon Sep 17 00:00:00 2001 From: Vincent Jumo Date: Sun, 14 Oct 2018 22:11:49 +0200 Subject: [PATCH] use host network mode to use current config hosts --- docker-compose.test.yml | 2 -- docker-compose.yml | 6 +++-- .../entities-search-engine-local.coffee | 5 ---- utils/config/inventaire-local.coffee | 26 ------------------- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 utils/config/entities-search-engine-local.coffee delete mode 100755 utils/config/inventaire-local.coffee diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 2d92ca7..807bd8f 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -12,8 +12,6 @@ services: environment: NODE_ENV: "tests" NODE_APP_INSTANCE: "tests-alt" - volumes: - - ./utils/config/inventaire-local.coffee:/opt/inventaire/config/local.coffee working_dir: /opt/inventaire entities-search-engine: environment: diff --git a/docker-compose.yml b/docker-compose.yml index 5bf3a25..c926b68 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ services: COUCHDB_PASSWORD: "password" volumes: - './data/couch:/usr/local/var/lib/couchdb' + network_mode: host inventaire: build: context: ./. @@ -17,8 +18,8 @@ services: - "3006:3006" volumes: - ./inventaire:/opt/inventaire - - ./utils/config/inventaire-local.coffee:/opt/inventaire/config/local.coffee working_dir: /opt/inventaire + network_mode: host elasticsearch: image: elasticsearch:2.4 environment: @@ -29,6 +30,7 @@ services: volumes: # backup folder when ES container is removed - './data/es:/usr/share/elasticsearch/data' + network_mode: host entities-search-engine: build: context: ./. @@ -38,5 +40,5 @@ 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 working_dir: /opt/entities-search-engine + network_mode: host diff --git a/utils/config/entities-search-engine-local.coffee b/utils/config/entities-search-engine-local.coffee deleted file mode 100644 index 1ce5475..0000000 --- a/utils/config/entities-search-engine-local.coffee +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = - elastic: - host: 'http://elasticsearch:9200' - inventaire: - host: 'http://inventaire:3006' diff --git a/utils/config/inventaire-local.coffee b/utils/config/inventaire-local.coffee deleted file mode 100755 index ee2e895..0000000 --- a/utils/config/inventaire-local.coffee +++ /dev/null @@ -1,26 +0,0 @@ -module.exports = - host: '0.0.0.0' - port: 3006 - elasticsearch: - host: 'http://elasticsearch:9200' - db: - protocol: 'http' - # host defined in docker-compose couchdb image name - host: 'couch' - port: '5984' - username: 'couchdb' - password: 'password' - debug: true - enableDesignDocSync: true - replication: - username: 'couchdb' - password: 'password' - jobs: - 'wd:popularity': - run: false - 'inv:deduplicate': - run: true - entitiesSearchEngine: - host: 'http://entities-search-engine:3213' - updateEnabled: true - delay: 3000