Merge pull request #6190 from duhow/optimize-dockerfiles-2

[3.4] Optimize Dockerfiles

msa/tb-node/docker/Dockerfile

@@ -21,16 +21,12 @@ RUN echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.sec
 COPY start-tb-node.sh ${pkg.name}.deb /tmp/
 
 RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-tb-node.sh /usr/bin
+    && mv /tmp/start-tb-node.sh /usr/bin && \
-
+    (yes | dpkg -i /tmp/${pkg.name}.deb) && \
-RUN yes | dpkg -i /tmp/${pkg.name}.deb
+    rm /tmp/${pkg.name}.deb && \
-RUN rm /tmp/${pkg.name}.deb
+    (systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :) && \
-
+    chown -R ${pkg.user}:${pkg.user} /tmp && \
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
+    chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
-
-RUN chown -R ${pkg.user}:${pkg.user} /tmp
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}
 

msa/transport/coap/docker/Dockerfile

@@ -19,14 +19,11 @@ FROM thingsboard/openjdk11
 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
+    && mv /tmp/start-tb-coap-transport.sh /usr/bin && \
-
+    (yes | dpkg -i /tmp/${pkg.name}.deb) && \
-RUN yes | dpkg -i /tmp/${pkg.name}.deb
+    rm /tmp/${pkg.name}.deb && \
-RUN 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
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}
 

msa/transport/http/docker/Dockerfile

@@ -19,14 +19,11 @@ FROM thingsboard/openjdk11
 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
+    && mv /tmp/start-tb-http-transport.sh /usr/bin && \
-
+    (yes | dpkg -i /tmp/${pkg.name}.deb) && \
-RUN yes | dpkg -i /tmp/${pkg.name}.deb
+    rm /tmp/${pkg.name}.deb && \
-RUN 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
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}
 

msa/transport/lwm2m/docker/Dockerfile

@@ -19,14 +19,11 @@ FROM thingsboard/openjdk11
 COPY start-tb-lwm2m-transport.sh ${pkg.name}.deb /tmp/
 
 RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-tb-lwm2m-transport.sh /usr/bin
+    && mv /tmp/start-tb-lwm2m-transport.sh /usr/bin && \
-
+    (yes | dpkg -i /tmp/${pkg.name}.deb) && \
-RUN yes | dpkg -i /tmp/${pkg.name}.deb
+    rm /tmp/${pkg.name}.deb && \
-RUN 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
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}
 

msa/transport/mqtt/docker/Dockerfile

@@ -19,14 +19,11 @@ FROM thingsboard/openjdk11
 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
+    && mv /tmp/start-tb-mqtt-transport.sh /usr/bin && \
-
+    (yes | dpkg -i /tmp/${pkg.name}.deb) && \
-RUN yes | dpkg -i /tmp/${pkg.name}.deb
+    rm /tmp/${pkg.name}.deb && \
-RUN 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
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}
 

msa/transport/snmp/docker/Dockerfile

@@ -19,14 +19,11 @@ FROM thingsboard/openjdk11
 COPY start-tb-snmp-transport.sh ${pkg.name}.deb /tmp/
 
 RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-tb-snmp-transport.sh /usr/bin
+    && mv /tmp/start-tb-snmp-transport.sh /usr/bin && \
-
+    (yes | dpkg -i /tmp/${pkg.name}.deb) && \
-RUN yes | dpkg -i /tmp/${pkg.name}.deb
+    rm /tmp/${pkg.name}.deb && \
-RUN 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
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}