dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Variables for docker image names

Browse Source
This commit is contained in:
Igor Kulikov 2018-10-04 19:44:01 +03:00
parent a19a86eab7
commit f9ba02570e
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
msa/docker/.env
View File

@ -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

8
msa/docker/docker-compose.yml
View File

@ -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:

3
msa/js-executor/pom.xml
View File

@ -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>

3
msa/tb-node/pom.xml
View File

@ -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>

3
msa/web-ui/pom.xml
View File

@ -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>