From 0d8f72d0c7c5e202ae8a057e2859ff445e827c5e Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 31 Dec 2024 10:23:31 +0200
Subject: [PATCH] Remove redudant pkg.upgradeVersion variable from docker
 upgrade.

---
 msa/tb/docker/install-tb.sh | 3 ---
 msa/tb/docker/upgrade-tb.sh | 8 --------
 msa/tb/pom.xml              | 1 -
 3 files changed, 12 deletions(-)

diff --git a/msa/tb/docker/install-tb.sh b/msa/tb/docker/install-tb.sh
index 9567908316..b926aac0bb 100644
--- a/msa/tb/docker/install-tb.sh
+++ b/msa/tb/docker/install-tb.sh
@@ -40,7 +40,6 @@ fi
 CONF_FOLDER="${pkg.installFolder}/conf"
 jarfile=${pkg.installFolder}/bin/${pkg.name}.jar
 configfile=${pkg.name}.conf
-upgradeversion=${DATA_FOLDER}/.upgradeversion
 
 source "${CONF_FOLDER}/${configfile}"
 
@@ -54,5 +53,3 @@ java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardI
                     -Dinstall.upgrade=false \
                     -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
                     org.springframework.boot.loader.launch.PropertiesLauncher
-
-echo "${pkg.upgradeVersion}" > ${upgradeversion}
diff --git a/msa/tb/docker/upgrade-tb.sh b/msa/tb/docker/upgrade-tb.sh
index 3e8f7d804a..3c8e4f194d 100644
--- a/msa/tb/docker/upgrade-tb.sh
+++ b/msa/tb/docker/upgrade-tb.sh
@@ -20,23 +20,15 @@ start-db.sh
 CONF_FOLDER="${pkg.installFolder}/conf"
 jarfile=${pkg.installFolder}/bin/${pkg.name}.jar
 configfile=${pkg.name}.conf
-upgradeversion=${DATA_FOLDER}/.upgradeversion
 
 source "${CONF_FOLDER}/${configfile}"
 
-FROM_VERSION=`cat ${upgradeversion}`
-
 echo "Starting ThingsBoard upgrade ..."
 
-fromVersion="${FROM_VERSION// }"
-
 java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication \
                 -Dspring.jpa.hibernate.ddl-auto=none \
                 -Dinstall.upgrade=true \
-                -Dinstall.upgrade.from_version=${fromVersion} \
                 -Dlogging.config=/usr/share/thingsboard/bin/install/logback.xml \
                 org.springframework.boot.loader.launch.PropertiesLauncher
 
-echo "${pkg.upgradeVersion}" > ${upgradeversion}
-
 stop-db.sh
\ No newline at end of file
diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml
index 3789fe14a1..5e79740c8b 100644
--- a/msa/tb/pom.xml
+++ b/msa/tb/pom.xml
@@ -38,7 +38,6 @@
         <tb-postgres.docker.name>tb-postgres</tb-postgres.docker.name>
         <tb-cassandra.docker.name>tb-cassandra</tb-cassandra.docker.name>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <pkg.upgradeVersion>3.9.0</pkg.upgradeVersion>
     </properties>
 
     <dependencies>