From a684b4a1dddaa891cb8dfc05675654bcc9475f9c Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 19 Jul 2022 17:57:55 +0300 Subject: [PATCH 1/2] Fix dockerfiles: replace curl with wget due to vurnelabilities --- msa/tb/docker-cassandra/Dockerfile | 6 +++--- msa/tb/docker-postgres/Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile index f4d00a8d37..74b0bc9adf 100644 --- a/msa/tb/docker-cassandra/Dockerfile +++ b/msa/tb/docker-cassandra/Dockerfile @@ -44,11 +44,11 @@ ENV CASSANDRA_LOG=/var/log/cassandra COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ RUN apt-get update \ - && apt-get install -y --no-install-recommends curl nmap procps gnupg2 \ + && apt-get install -y --no-install-recommends wget nmap procps gnupg2 \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \ - && curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ + && wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | apt-key add - \ && echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null \ - && curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add - \ + && wget -q https://downloads.apache.org/cassandra/KEYS -O- | apt-key add - \ && apt-get update \ && apt-get install -y --no-install-recommends cassandra cassandra-tools postgresql-${PG_MAJOR} \ && rm -rf /var/lib/apt/lists/* \ diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile index 90616c2ff0..beae273c4a 100644 --- a/msa/tb/docker-postgres/Dockerfile +++ b/msa/tb/docker-postgres/Dockerfile @@ -36,9 +36,9 @@ ENV PGLOG=/var/log/postgres COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ RUN apt-get update \ - && apt-get install -y --no-install-recommends curl gnupg2 \ + && apt-get install -y --no-install-recommends wget gnupg2 \ && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \ - && curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ + && wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | apt-key add - \ && apt-get update \ && apt-get install -y --no-install-recommends postgresql-${PG_MAJOR} \ && rm -rf /var/lib/apt/lists/* \ From c0eaa2f772adf75035c9e8a475fbee109b062399 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Wed, 20 Jul 2022 11:22:25 +0200 Subject: [PATCH 2/2] fixed upgrade script --- .../server/service/install/update/DefaultDataUpdateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java index cb560bb5ff..b90da586fc 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java @@ -156,8 +156,8 @@ public class DefaultDataUpdateService implements DataUpdateService { break; case "3.3.4": log.info("Updating data from version 3.3.4 to 3.4.0 ..."); - rateLimitsUpdater.updateEntities(); tenantsProfileQueueConfigurationUpdater.updateEntities(); + rateLimitsUpdater.updateEntities(); break; default: throw new RuntimeException("Unable to update data, unsupported fromVersion: " + fromVersion);