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

Replaced edge latest version to specific version

Browse Source
This commit is contained in:
Volodymyr Babak 2023-01-04 11:11:28 +02:00
parent fd03d333bd
commit 5ad3d905ae
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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