From dc8798e0c23c83485826c3ef966f74796e319220 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 16 Jun 2022 15:21:45 +0300
Subject: [PATCH] Update vc-executor docker build script

---
 msa/vc-executor-docker/docker/Dockerfile | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/msa/vc-executor-docker/docker/Dockerfile b/msa/vc-executor-docker/docker/Dockerfile
index f4ff25e0e5..af259d8f67 100644
--- a/msa/vc-executor-docker/docker/Dockerfile
+++ b/msa/vc-executor-docker/docker/Dockerfile
@@ -14,22 +14,18 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-vc-executor.sh ${pkg.name}.deb /tmp/
 
-RUN mkdir -p /home/thingsboard/.config/jgit
-RUN chown -R ${pkg.user}:${pkg.user} /home/thingsboard
-
-RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-tb-vc-executor.sh /usr/bin
-
-RUN yes | dpkg -i /tmp/${pkg.name}.deb
-RUN rm /tmp/${pkg.name}.deb
-
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+RUN mkdir -p /home/thingsboard/.config/jgit \
+    && chown -R ${pkg.user}:${pkg.user} /home/thingsboard \
+    && chmod a+x /tmp/*.sh \
+    && mv /tmp/start-tb-vc-executor.sh /usr/bin && \
+    (yes | dpkg -i /tmp/${pkg.name}.deb) && \
+    rm /tmp/${pkg.name}.deb && \
+    (systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :) && \
+    chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}