Rename ws-proxy container and change its env vars

devicehive · Dec 27, 2017 · 6b519ca · 6b519ca
1 parent 8bbc809
commit 6b519ca
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/rdbms-image/ci-images.yml b/rdbms-image/ci-images.yml
@@ -12,8 +12,8 @@ services:
   dh_backend:
     image: devicehiveci/devicehive-backend:${DH_TAG:-development}
 
-  kafkaproxy:
-    image: devicehiveci/devicehive-ws-kafka-proxy:${DH_WS_KAFKA_PROXY_TAG:-master}
+  wsproxy:
+    image: devicehiveci/devicehive-ws-proxy:${DH_WS_PROXY_TAG:-development}
 
   dh_proxy:
     image: devicehiveci/devicehive-proxy:${DH_PROXY_TAG:-development}
diff --git a/rdbms-image/dh_plugin.yml b/rdbms-image/dh_plugin.yml
@@ -10,7 +10,7 @@ services:
       - "zookeeper"
       - "dh_frontend"
       - "dh_auth"
-      - "kafkaproxy"
+      - "wsproxy"
     restart: unless-stopped
     environment:
       DH_ZK_ADDRESS: ${DH_ZK_ADDRESS:-zookeeper}
@@ -24,9 +24,16 @@ services:
       DH_RPC_CLIENT_RES_CONS_THREADS: ${DH_RPC_CLIENT_RES_CONS_THREADS:-3}
       DH_LOG_LEVEL: ${DH_LOG_LEVEL:-INFO}
       ROOT_LOG_LEVEL: ${ROOT_LOG_LEVEL:-WARN}
-      DH_WS_KAFKA_PROXY: kafkaproxy:3000
-      DH_AUTH_URL: ${DH_AUTH_URL:-http://dh_auth:8090/api/rest}
+      DH_WS_PROXY: wsproxy:3000
+      DH_AUTH_URL: http://dh_auth:8090/auth/rest
       HC_MEMBERS: hazelcast
       HC_GROUP_NAME: ${HC_GROUP_NAME:-dev}
       HC_GROUP_PASSWORD: ${HC_GROUP_PASSWORD:-dev-pass}
       JWT_SECRET: ${JWT_SECRET}
+
+  wsproxy:
+    links:
+      - "dh_auth"
+    environment:
+      PROXY.ENABLE_PLUGIN_MANAGER: 'true'
+      PLUGIN_MANAGER.AUTH_SERVICE_ENDPOINT: http://dh_auth:8090/auth/rest
diff --git a/rdbms-image/docker-compose-dev.yml b/rdbms-image/docker-compose-dev.yml
@@ -32,16 +32,16 @@ services:
     volumes:
       - devicehive-db-dev:/var/lib/postgresql/data
 
-  kafkaproxy:
-    image: devicehive/devicehive-ws-kafka-proxy:${DH_WS_KAFKA_PROXY_TAG:-latest}
+  wsproxy:
+    image: devicehive/devicehive-ws-proxy:${DH_WS_PROXY_TAG:-development}
     ports:
       - "3000:3000"
     links:
       - "kafka"
     restart: unless-stopped
     environment:
-      KAFKA_MBR: ${DH_KAFKA_BOOTSTRAP_SERVERS:-kafka:9092}
-      WSS_PORT: 3000
+      KAFKA.KAFKA_HOSTS: ${DH_KAFKA_BOOTSTRAP_SERVERS:-kafka:9092}
+      PROXY.WEB_SOCKET_SERVER_HOST: 'wsproxy'
 
   hazelcast:
     image: devicehive/devicehive-hazelcast:${DH_TAG:-development}

diff --git a/rdbms-image/docker-compose.yml b/rdbms-image/docker-compose.yml
@@ -31,14 +31,14 @@ services:
     volumes:
       - devicehive-db:/var/lib/postgresql/data
 
-  kafkaproxy:
-    image: devicehive/devicehive-ws-kafka-proxy:${DH_WS_KAFKA_PROXY_TAG:-latest}
+  wsproxy:
+    image: devicehive/devicehive-ws-proxy:${DH_WS_PROXY_TAG:-development}
     links:
       - "kafka"
     restart: unless-stopped
     environment:
-      KAFKA_MBR: ${DH_KAFKA_BOOTSTRAP_SERVERS:-kafka:9092}
-      WSS_PORT: 3000
+      KAFKA.KAFKA_HOSTS: ${DH_KAFKA_BOOTSTRAP_SERVERS:-kafka:9092}
+      PROXY.WEB_SOCKET_SERVER_HOST: 'wsproxy'
 
   dh_frontend:
     image: devicehive/devicehive-frontend:${DH_TAG:-development}
@@ -48,7 +48,7 @@ services:
       - "zookeeper"
       - "dh_backend"
       - "dh_auth"
-      - "kafkaproxy"
+      - "wsproxy"
     restart: unless-stopped
     environment:
       DH_ZK_ADDRESS: ${DH_ZK_ADDRESS:-zookeeper}
@@ -61,7 +61,7 @@ services:
       DH_POSTGRES_DB: ${DH_POSTGRES_DB:-postgres}
       DH_RPC_CLIENT_RES_CONS_THREADS: ${DH_RPC_CLIENT_RES_CONS_THREADS:-3}
       DH_LOG_LEVEL: ${DH_LOG_LEVEL:-INFO}
-      DH_WS_KAFKA_PROXY: kafkaproxy:3000
+      DH_WS_PROXY: wsproxy:3000
       ROOT_LOG_LEVEL: ${ROOT_LOG_LEVEL:-WARN}
       DH_AUTH_URL: ${DH_AUTH_URL:-http://dh_auth:8090/auth/rest}
       HC_MEMBERS: hazelcast
@@ -105,7 +105,7 @@ services:
       - "kafka"
       - "postgres"
       - "zookeeper"
-      - "kafkaproxy"
+      - "wsproxy"
     restart: unless-stopped
     environment:
       DH_ZK_ADDRESS: ${DH_ZK_ADDRESS:-zookeeper}
@@ -119,7 +119,7 @@ services:
       DH_RPC_SERVER_REQ_CONS_THREADS: ${DH_RPC_SERVER_REQ_CONS_THREADS:-3}
       DH_RPC_SERVER_WORKER_THREADS: ${DH_RPC_SERVER_WORKER_THREADS:-3}
       DH_LOG_LEVEL: ${DH_LOG_LEVEL:-INFO}
-      DH_WS_KAFKA_PROXY: kafkaproxy:3000
+      DH_WS_PROXY: wsproxy:3000
       ROOT_LOG_LEVEL: ${ROOT_LOG_LEVEL:-INFO}
       HC_MEMBERS: hazelcast
       HC_GROUP_NAME: ${HC_GROUP_NAME:-dev}