From 2ff8c3f97260991f9785f9e791c539b8f0597cc9 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 3 Jan 2023 10:03:51 +0200 Subject: [PATCH] Set docker container version to latest --- .../data/json/edge/install_instructions/docker/instructions.md | 2 +- .../service/edge/instructions/DefaultEdgeInstallService.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/application/src/main/data/json/edge/install_instructions/docker/instructions.md b/application/src/main/data/json/edge/install_instructions/docker/instructions.md index 8ff270e460..ff36da0e79 100644 --- a/application/src/main/data/json/edge/install_instructions/docker/instructions.md +++ b/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:${EDGE_VERSION}" + image: "thingsboard/tb-edge:latest" ports: - "8080:8080" - "1883:1883" diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java index 0839d1e9d9..e13e3ade25 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java @@ -40,8 +40,6 @@ public class DefaultEdgeInstallService implements EdgeInstallService { private static final String EDGE_DIR = "edge"; - private static final String EDGE_VERSION = "3.4.3EDGE"; - private static final String EDGE_INSTALL_INSTRUCTIONS_DIR = "install_instructions"; private final InstallScripts installScripts; @@ -58,7 +56,6 @@ public class DefaultEdgeInstallService implements EdgeInstallService { dockerInstallInstructions = dockerInstallInstructions.replace("${LOCALHOST_WARNING}", ""); dockerInstallInstructions = dockerInstallInstructions.replace("${BASE_URL}", baseUrl); } - dockerInstallInstructions = dockerInstallInstructions.replace("${EDGE_VERSION}", EDGE_VERSION); dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_ROUTING_KEY}", edge.getRoutingKey()); dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_ROUTING_SECRET}", edge.getSecret()); return new EdgeInstallInstructions(dockerInstallInstructions);