Browse Source

Replaced edge latest version to specific version

pull/7878/head
Volodymyr Babak 4 years ago
parent
commit
5ad3d905ae
  1. 2
      application/src/main/data/json/edge/install_instructions/docker/instructions.md
  2. 4
      application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java

2
application/src/main/data/json/edge/install_instructions/docker/instructions.md

@ -36,7 +36,7 @@ version: '3.0'
services:
mytbedge:
restart: always
image: "thingsboard/tb-edge:latest"
image: "thingsboard/tb-edge:${TB_EDGE_VERSION}"
ports:
- "8080:8080"
- "1883:1883"

4
application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java

@ -52,6 +52,9 @@ public class DefaultEdgeInstallService implements EdgeInstallService {
@Value("${edges.rpc.ssl.enabled}")
private boolean sslEnabled;
@Value("${app.version:unknown}")
private String appVersion;
@Override
public EdgeInstallInstructions getDockerInstallInstructions(TenantId tenantId, Edge edge, HttpServletRequest request) {
String dockerInstallInstructions = readFile(resolveFile("docker", "instructions.md"));
@ -64,6 +67,7 @@ public class DefaultEdgeInstallService implements EdgeInstallService {
dockerInstallInstructions = dockerInstallInstructions.replace("${LOCALHOST_WARNING}", "");
dockerInstallInstructions = dockerInstallInstructions.replace("${BASE_URL}", baseUrl);
}
dockerInstallInstructions = dockerInstallInstructions.replace("${TB_EDGE_VERSION}", appVersion + "EDGE");
dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_ROUTING_KEY}", edge.getRoutingKey());
dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_ROUTING_SECRET}", edge.getSecret());
dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_RPC_PORT}", Integer.toString(rpcPort));

Loading…
Cancel
Save