diff --git a/Dockerfile.entities-search-engine b/Dockerfile.entities-search-engine index 40d61ea..3dba4b4 100644 --- a/Dockerfile.entities-search-engine +++ b/Dockerfile.entities-search-engine @@ -1,4 +1,2 @@ -FROM node:6.11.1 -ENV USER=inventaire - -CMD [ "node_modules/coffee-script/bin/coffee", "server/server.coffee"] \ No newline at end of file +FROM node:8-alpine +CMD [ "node_modules/coffee-script/bin/coffee", "server/server.coffee"] diff --git a/docker-compose-test.yml b/docker-compose-test.yml index f3ff385..8199e01 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -33,8 +33,11 @@ services: volumes: - './data/es:/usr/share/elasticsearch/data' entities-search-engine: - image: node:8 - command: 'node_modules/coffee-script/bin/coffee server/server.coffee' + build: + context: ./. + dockerfile: Dockerfile.entities-search-engine + environment: + NODE_ENV: "tests" ports: - "3213:3213" volumes: diff --git a/docker-compose.yml b/docker-compose.yml index d53c665..5bf3a25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,9 @@ services: # backup folder when ES container is removed - './data/es:/usr/share/elasticsearch/data' entities-search-engine: - image: node:8 + build: + context: ./. + dockerfile: Dockerfile.entities-search-engine command: 'node_modules/coffee-script/bin/coffee server/server.coffee' ports: - "3213:3213" diff --git a/utils/config/entities-search-engine-local.coffee b/utils/config/entities-search-engine-local.coffee index 2b7f812..1ce5475 100644 --- a/utils/config/entities-search-engine-local.coffee +++ b/utils/config/entities-search-engine-local.coffee @@ -1,2 +1,5 @@ -elastic: - host: 'http://elasticsearch:9200' +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 index 579ef8a..ee2e895 100755 --- a/utils/config/inventaire-local.coffee +++ b/utils/config/inventaire-local.coffee @@ -21,6 +21,6 @@ module.exports = 'inv:deduplicate': run: true entitiesSearchEngine: - updateEnabled: false - localPath: '/opt/entities-search-engine' + host: 'http://entities-search-engine:3213' + updateEnabled: true delay: 3000