From f9ba02570ecd85a33bda997cb6d1700526dd7be7 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 4 Oct 2018 19:44:01 +0300
Subject: [PATCH] Variables for docker image names

---
 msa/docker/.env               | 5 +++++
 msa/docker/docker-compose.yml | 8 ++++----
 msa/js-executor/pom.xml       | 3 ++-
 msa/tb-node/pom.xml           | 3 ++-
 msa/web-ui/pom.xml            | 3 ++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/msa/docker/.env b/msa/docker/.env
index 3b0b91d353..111ff1e2b4 100644
--- a/msa/docker/.env
+++ b/msa/docker/.env
@@ -1,5 +1,10 @@
 
 DOCKER_REPO=local-maven-build
+
+JS_EXECUTOR_DOCKER_NAME=tb-js-executor
+TB_NODE_DOCKER_NAME=tb-node
+WEB_UI_DOCKER_NAME=tb-web-ui
+
 TB_VERSION=2.2.0-SNAPSHOT
 
 KAFKA_TOPICS=js.eval.requests:100:1
diff --git a/msa/docker/docker-compose.yml b/msa/docker/docker-compose.yml
index 9ddbea3a04..b6b44d7401 100644
--- a/msa/docker/docker-compose.yml
+++ b/msa/docker/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       - zookeeper
   tb-js-executor:
     restart: always
-    image: "${DOCKER_REPO}/tb-js-executor:${TB_VERSION}"
+    image: "${DOCKER_REPO}/${JS_EXECUTOR_DOCKER_NAME}:${TB_VERSION}"
     environment:
       TB_KAFKA_SERVERS: kafka:9092
     env_file:
@@ -49,7 +49,7 @@ services:
       - kafka
   tb:
     restart: always
-    image: "${DOCKER_REPO}/tb-node:${TB_VERSION}"
+    image: "${DOCKER_REPO}/${TB_NODE_DOCKER_NAME}:${TB_VERSION}"
     ports:
       - "8080"
       - "1883:1883"
@@ -68,7 +68,7 @@ services:
       - kafka
   tb-web-ui1:
     restart: always
-    image: "${DOCKER_REPO}/tb-web-ui:${TB_VERSION}"
+    image: "${DOCKER_REPO}/${WEB_UI_DOCKER_NAME}:${TB_VERSION}"
     ports:
       - "8080"
     environment:
@@ -78,7 +78,7 @@ services:
       - tb-web-ui.env
   tb-web-ui2:
     restart: always
-    image: "${DOCKER_REPO}/tb-web-ui:${TB_VERSION}"
+    image: "${DOCKER_REPO}/${WEB_UI_DOCKER_NAME}:${TB_VERSION}"
     ports:
       - "8080"
     environment:
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index 84792f18b8..6f11df1452 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -35,6 +35,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.name>tb-js-executor</pkg.name>
+        <docker.name>tb-js-executor</docker.name>
         <pkg.user>thingsboard</pkg.user>
         <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
@@ -290,7 +291,7 @@
                 </executions>
                 <configuration>
                     <skip>${dockerfile.skip}</skip>
-                    <repository>${docker.repo}/${pkg.name}</repository>
+                    <repository>${docker.repo}/${docker.name}</repository>
                     <tag>${project.version}</tag>
                     <verbose>true</verbose>
                     <googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>
diff --git a/msa/tb-node/pom.xml b/msa/tb-node/pom.xml
index 436d88b994..18a81f3970 100644
--- a/msa/tb-node/pom.xml
+++ b/msa/tb-node/pom.xml
@@ -35,6 +35,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.name>thingsboard</pkg.name>
+        <docker.name>tb-node</docker.name>
         <pkg.user>thingsboard</pkg.user>
         <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
@@ -114,7 +115,7 @@
                 </executions>
                 <configuration>
                     <skip>${dockerfile.skip}</skip>
-                    <repository>${docker.repo}/tb-node</repository>
+                    <repository>${docker.repo}/${docker.name}</repository>
                     <tag>${project.version}</tag>
                     <verbose>true</verbose>
                     <googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index 32a076d183..805bf8b821 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -35,6 +35,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.dir>${basedir}/../..</main.dir>
         <pkg.name>tb-web-ui</pkg.name>
+        <docker.name>tb-web-ui</docker.name>
         <pkg.user>thingsboard</pkg.user>
         <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
@@ -314,7 +315,7 @@
                 </executions>
                 <configuration>
                     <skip>${dockerfile.skip}</skip>
-                    <repository>${docker.repo}/${pkg.name}</repository>
+                    <repository>${docker.repo}/${docker.name}</repository>
                     <tag>${project.version}</tag>
                     <verbose>true</verbose>
                     <googleContainerRegistryEnabled>false</googleContainerRegistryEnabled>