From f0070839506e7e6220b202cfc7416753fdcc932d Mon Sep 17 00:00:00 2001 From: Vincent Jumo Date: Tue, 16 Oct 2018 18:32:06 +0200 Subject: [PATCH] update inv image to node 8.12 --- Dockerfile.inventaire | 14 +++----------- README.md | 6 ++++-- docker-compose.test.yml | 1 - 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Dockerfile.inventaire b/Dockerfile.inventaire index 78f6ac2..bfa2592 100755 --- a/Dockerfile.inventaire +++ b/Dockerfile.inventaire @@ -1,15 +1,7 @@ -FROM node:6.11.1 -ENV USER=inventaire +FROM node:8.12.0-jessie RUN apt-get update \ - && apt-get -y upgrade \ - && apt-get install -y curl \ - zsh \ - git \ - nginx \ - graphicsmagick \ - openssl \ - inotify-tools \ + && apt-get install -y curl zsh git graphicsmagick inotify-tools \ && apt-get clean -CMD ["npm", "start"] \ No newline at end of file +CMD ["npm", "start"] diff --git a/README.md b/README.md index 6ae0d94..f14c030 100644 --- a/README.md +++ b/README.md @@ -45,10 +45,12 @@ Check out [official doc](https://docs.docker.com/compose/) ## Load wikidata into elasticsearch -Make sure ES import limit is above entities-search-engige import rate, by raising the limit +Make sure ES import limit is above entities-search-engige import rate, by [closing the index](https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-open-close.html) first, raising the limit & reopen the index ``` -docker-compose exec entities-search-engine curl -XPUT http://elasticsearch:9200/wikidata/_settings -d '{"index.mapping.total_fields.limit": 20000}' +curl -XPOST http://localhost:9200/wikidata/_close +curl -XPUT http://localhost:9200/wikidata/_settings -d '{"index.mapping.total_fields.limit": 20000}' +curl -XPOST http://localhost:9200/wikidata/_open ``` start the containers `docker-compose up` diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 807bd8f..abd2f0b 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -12,7 +12,6 @@ services: environment: NODE_ENV: "tests" NODE_APP_INSTANCE: "tests-alt" - working_dir: /opt/inventaire entities-search-engine: environment: NODE_ENV: "tests"