Merge pull request #20 from hutomadotAI/pedrotei/er-lang

Force using latest docker images and ER lang on API config

Author: pedrotei

docker-compose_template.yml

@@ -47,8 +47,8 @@ services:
     - API_CONNECTION_STRING=jdbc:mysql://api-db:3306/hutoma?user=hutoma_caller&password=$API_DB_HUTOMA_CALLER_PASSWORD&zeroDateTimeBehavior=convertToNull
     - API_LOGGING_FLUENT_HOST=log-fluent
     - API_LOGGING_FLUENT_PORT=24224
-    - API_ENTITY_RECOGNIZER_URL=http://api-entity:9095/ner
-    - API_FIND_ENTITY_URL=http://api-entity:9095/findentities
+    - API_ENTITY_RECOGNIZER_URL=http://ai-entity-[lang]:9095/ner
+    - API_FIND_ENTITY_URL=http://ai-entity-[lang]:9095/findentities
     - API_FB_APP_ID=$FACEBOOK_APP_ID
     - API_FB_APP_SECRET=$FACEBOOK_APP_SECRET
     - API_ANALYTICS_ES_URLS=http://log-es:9200

launch.sh

@@ -1,14 +1,14 @@
 #!/bin/bash
 
-export IMAGE_API_DB='eu.gcr.io/hutoma-oss/core/db'
-export IMAGE_LOG_FLUENT='eu.gcr.io/hutoma-oss/core/fluent'
-export IMAGE_API_CTRL='eu.gcr.io/hutoma-oss/core/api-ctrl'
-export IMAGE_API_SVC='eu.gcr.io/hutoma-oss/core/api-svc'
-export IMAGE_API_ENTITY='eu.gcr.io/hutoma-oss/core/entity-rec'
-export IMAGE_EMBEDDING='eu.gcr.io/hutoma-oss/core/embedding'
-export IMAGE_WEB_REVERSE_PROXY='eu.gcr.io/hutoma-oss/core/reverse-proxy'
-export IMAGE_WEB_CONSOLE='eu.gcr.io/hutoma-oss/core/web-console'
-export IMAGE_WEB_MEDIASERVER='eu.gcr.io/hutoma-oss/core/web-media'
-export IMAGE_WORD2VEC='eu.gcr.io/hutoma-oss/core/word2vec'
+export IMAGE_API_DB='eu.gcr.io/hutoma-oss/core/db:latest'
+export IMAGE_LOG_FLUENT='eu.gcr.io/hutoma-oss/core/fluent:latest'
+export IMAGE_API_CTRL='eu.gcr.io/hutoma-oss/core/api-ctrl:latest'
+export IMAGE_API_SVC='eu.gcr.io/hutoma-oss/core/api-svc:latest'
+export IMAGE_API_ENTITY='eu.gcr.io/hutoma-oss/core/entity-rec:latest'
+export IMAGE_EMBEDDING='eu.gcr.io/hutoma-oss/core/embedding:latest'
+export IMAGE_WEB_REVERSE_PROXY='eu.gcr.io/hutoma-oss/core/reverse-proxy:latest'
+export IMAGE_WEB_CONSOLE='eu.gcr.io/hutoma-oss/core/web-console:latest'
+export IMAGE_WEB_MEDIASERVER='eu.gcr.io/hutoma-oss/core/web-media:latest'
+export IMAGE_WORD2VEC='eu.gcr.io/hutoma-oss/core/word2vec:latest'
 
-./_launch_system.sh
+./_launch_system.sh