From 0cae071e5abb727175f72b394c2f6c1ae1e1a4e1 Mon Sep 17 00:00:00 2001
From: VoBa <volodymyr.babak@gmail.com>
Date: Thu, 30 Apr 2020 09:37:08 +0300
Subject: [PATCH] =?UTF-8?q?Make=20executable=20files=20to=20be=20able=20to?=
 =?UTF-8?q?=20run=20by=20non=20root=20and=20non=20thingsboa=E2=80=A6=20(#2?=
 =?UTF-8?q?698)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make executable files to be able to run by non root and non thingsboard user (to be in sync with OpenShift policies)

* Added default yes to agreement
---
 msa/js-executor/docker/Dockerfile    | 4 +++-
 msa/tb-node/docker/Dockerfile        | 4 +++-
 msa/transport/coap/docker/Dockerfile | 4 +++-
 msa/transport/http/docker/Dockerfile | 4 +++-
 msa/transport/mqtt/docker/Dockerfile | 4 +++-
 msa/web-ui/docker/Dockerfile         | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/msa/js-executor/docker/Dockerfile b/msa/js-executor/docker/Dockerfile
index 276fd03b13..d210a4dbb3 100644
--- a/msa/js-executor/docker/Dockerfile
+++ b/msa/js-executor/docker/Dockerfile
@@ -21,10 +21,12 @@ COPY start-js-executor.sh ${pkg.name}.deb /tmp/
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-js-executor.sh /usr/bin
 
-RUN dpkg -i /tmp/${pkg.name}.deb
+RUN yes | dpkg -i /tmp/${pkg.name}.deb
 
 RUN update-rc.d ${pkg.name} disable
 
+RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}
+
 USER ${pkg.user}
 
 CMD ["start-js-executor.sh"]
diff --git a/msa/tb-node/docker/Dockerfile b/msa/tb-node/docker/Dockerfile
index eee8330f15..b7a2dbf346 100644
--- a/msa/tb-node/docker/Dockerfile
+++ b/msa/tb-node/docker/Dockerfile
@@ -21,12 +21,14 @@ COPY start-tb-node.sh ${pkg.name}.deb /tmp/
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb-node.sh /usr/bin
 
-RUN dpkg -i /tmp/${pkg.name}.deb
+RUN yes | dpkg -i /tmp/${pkg.name}.deb
 
 RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
 
 RUN chown -R ${pkg.user}:${pkg.user} /tmp
 
+RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+
 USER ${pkg.user}
 
 CMD ["start-tb-node.sh"]
diff --git a/msa/transport/coap/docker/Dockerfile b/msa/transport/coap/docker/Dockerfile
index 07cb0101b9..5f297cdc4d 100644
--- a/msa/transport/coap/docker/Dockerfile
+++ b/msa/transport/coap/docker/Dockerfile
@@ -21,10 +21,12 @@ COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb-coap-transport.sh /usr/bin
 
-RUN dpkg -i /tmp/${pkg.name}.deb
+RUN yes | dpkg -i /tmp/${pkg.name}.deb
 
 RUN update-rc.d ${pkg.name} disable
 
+RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+
 USER ${pkg.user}
 
 CMD ["start-tb-coap-transport.sh"]
diff --git a/msa/transport/http/docker/Dockerfile b/msa/transport/http/docker/Dockerfile
index b49cf204f8..32d3bdaf98 100644
--- a/msa/transport/http/docker/Dockerfile
+++ b/msa/transport/http/docker/Dockerfile
@@ -21,10 +21,12 @@ COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb-http-transport.sh /usr/bin
 
-RUN dpkg -i /tmp/${pkg.name}.deb
+RUN yes | dpkg -i /tmp/${pkg.name}.deb
 
 RUN update-rc.d ${pkg.name} disable
 
+RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+
 USER ${pkg.user}
 
 CMD ["start-tb-http-transport.sh"]
diff --git a/msa/transport/mqtt/docker/Dockerfile b/msa/transport/mqtt/docker/Dockerfile
index 149911f8b5..cc3b90e570 100644
--- a/msa/transport/mqtt/docker/Dockerfile
+++ b/msa/transport/mqtt/docker/Dockerfile
@@ -21,10 +21,12 @@ COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb-mqtt-transport.sh /usr/bin
 
-RUN dpkg -i /tmp/${pkg.name}.deb
+RUN yes | dpkg -i /tmp/${pkg.name}.deb
 
 RUN update-rc.d ${pkg.name} disable
 
+RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+
 USER ${pkg.user}
 
 CMD ["start-tb-mqtt-transport.sh"]
diff --git a/msa/web-ui/docker/Dockerfile b/msa/web-ui/docker/Dockerfile
index 3609c289e4..7f6178111b 100644
--- a/msa/web-ui/docker/Dockerfile
+++ b/msa/web-ui/docker/Dockerfile
@@ -21,10 +21,12 @@ COPY start-web-ui.sh ${pkg.name}.deb /tmp/
 RUN chmod a+x /tmp/*.sh \
     && mv /tmp/start-web-ui.sh /usr/bin
 
-RUN dpkg -i /tmp/${pkg.name}.deb
+RUN yes | dpkg -i /tmp/${pkg.name}.deb
 
 RUN update-rc.d ${pkg.name} disable
 
+RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}
+
 USER ${pkg.user}
 
 CMD ["start-web-ui.sh"]