From 0188efce7e825a7c626781356c52843314936970 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 24 Oct 2023 13:57:22 +0200
Subject: [PATCH 1/4] docker: removed as it exists in the latest base image
 openjdk11:bullseye-slim: echo 'networkaddress.cache.ttl=60' >>
 /etc/java-11-openjdk/security/java.security

---
 msa/tb-node/docker/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/msa/tb-node/docker/Dockerfile b/msa/tb-node/docker/Dockerfile
index 68e428992a..86fd04cad2 100644
--- a/msa/tb-node/docker/Dockerfile
+++ b/msa/tb-node/docker/Dockerfile
@@ -18,8 +18,7 @@ FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-node.sh ${pkg.name}.deb /tmp/
 
-RUN echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.security \
-    && chmod a+x /tmp/*.sh \
+RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb-node.sh /usr/bin && \
     (yes | dpkg -i /tmp/${pkg.name}.deb) && \
     rm /tmp/${pkg.name}.deb && \

From 1b428cf84d83ce9eeff4d9304cee059850df774a Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 24 Oct 2023 14:01:22 +0200
Subject: [PATCH 2/4] docker: bump minor version FROM
 thingsboard/node:16.20.2-bookworm-slim (previous was 16.17.0-bullseye-slim)

---
 msa/js-executor/docker/Dockerfile | 2 +-
 msa/web-ui/docker/Dockerfile      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/msa/js-executor/docker/Dockerfile b/msa/js-executor/docker/Dockerfile
index f934628a96..ef22343442 100644
--- a/msa/js-executor/docker/Dockerfile
+++ b/msa/js-executor/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/node:16.17.0-bullseye-slim
+FROM thingsboard/node:16.20.2-bookworm-slim
 
 ENV NODE_ENV production
 ENV DOCKER_MODE true
diff --git a/msa/web-ui/docker/Dockerfile b/msa/web-ui/docker/Dockerfile
index cf5df5ee2c..18a19e0ead 100644
--- a/msa/web-ui/docker/Dockerfile
+++ b/msa/web-ui/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/node:16.17.0-bullseye-slim
+FROM thingsboard/node:16.20.2-bookworm-slim
 
 ENV NODE_ENV production
 ENV DOCKER_MODE true

From 23b597003238c7879d286b1544f4d477e760a92c Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 24 Oct 2023 14:05:58 +0200
Subject: [PATCH 3/4] docker: bump minor version
 thingsboard/haproxy-certbot:2.2.31-alpine3.18

---
 docker/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 78ca337e0a..942be3782a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -300,7 +300,7 @@ services:
   haproxy:
     restart: always
     container_name: "${LOAD_BALANCER_NAME}"
-    image: thingsboard/haproxy-certbot:1.3.0
+    image: thingsboard/haproxy-certbot:2.2.31-alpine3.18
     volumes:
      - ./haproxy/config:/config
      - ./haproxy/letsencrypt:/etc/letsencrypt

From fe26fb694ce5b8643f0e64005883375148c07c86 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 24 Oct 2023 16:21:12 +0200
Subject: [PATCH 4/4] msa <nodeVersion>v16.20.2</nodeVersion>

---
 msa/js-executor/pom.xml | 2 +-
 msa/web-ui/pom.xml      | 2 +-
 ui-ngx/pom.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index 128479e5eb..1cf55d9795 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -71,7 +71,7 @@
                             <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.15.1</nodeVersion>
+                            <nodeVersion>v16.20.2</nodeVersion>
                             <yarnVersion>v1.22.17</yarnVersion>
                         </configuration>
                     </execution>
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index cbee67c12e..02772a68e3 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -80,7 +80,7 @@
                             <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.15.1</nodeVersion>
+                            <nodeVersion>v16.20.2</nodeVersion>
                             <yarnVersion>v1.22.17</yarnVersion>
                         </configuration>
                     </execution>
diff --git a/ui-ngx/pom.xml b/ui-ngx/pom.xml
index 84b5f8b98c..2c09d29af2 100644
--- a/ui-ngx/pom.xml
+++ b/ui-ngx/pom.xml
@@ -56,7 +56,7 @@
                             <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.15.1</nodeVersion>
+                            <nodeVersion>v16.20.2</nodeVersion>
                             <yarnVersion>v1.22.17</yarnVersion>
                         </configuration>
                     </execution>