Make executable files to be able to run by non root and non thingsboa… (#2698)
* 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
This commit is contained in:
		
							parent
							
								
									1599b24c3a
								
							
						
					
					
						commit
						0cae071e5a
					
				@ -21,10 +21,12 @@ COPY start-js-executor.sh ${pkg.name}.deb /tmp/
 | 
				
			|||||||
RUN chmod a+x /tmp/*.sh \
 | 
					RUN chmod a+x /tmp/*.sh \
 | 
				
			||||||
    && mv /tmp/start-js-executor.sh /usr/bin
 | 
					    && 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 update-rc.d ${pkg.name} disable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER ${pkg.user}
 | 
					USER ${pkg.user}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CMD ["start-js-executor.sh"]
 | 
					CMD ["start-js-executor.sh"]
 | 
				
			||||||
 | 
				
			|||||||
@ -21,12 +21,14 @@ COPY start-tb-node.sh ${pkg.name}.deb /tmp/
 | 
				
			|||||||
RUN chmod a+x /tmp/*.sh \
 | 
					RUN chmod a+x /tmp/*.sh \
 | 
				
			||||||
    && mv /tmp/start-tb-node.sh /usr/bin
 | 
					    && 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN chown -R ${pkg.user}:${pkg.user} /tmp
 | 
					RUN chown -R ${pkg.user}:${pkg.user} /tmp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER ${pkg.user}
 | 
					USER ${pkg.user}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CMD ["start-tb-node.sh"]
 | 
					CMD ["start-tb-node.sh"]
 | 
				
			||||||
 | 
				
			|||||||
@ -21,10 +21,12 @@ COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/
 | 
				
			|||||||
RUN chmod a+x /tmp/*.sh \
 | 
					RUN chmod a+x /tmp/*.sh \
 | 
				
			||||||
    && mv /tmp/start-tb-coap-transport.sh /usr/bin
 | 
					    && 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 update-rc.d ${pkg.name} disable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER ${pkg.user}
 | 
					USER ${pkg.user}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CMD ["start-tb-coap-transport.sh"]
 | 
					CMD ["start-tb-coap-transport.sh"]
 | 
				
			||||||
 | 
				
			|||||||
@ -21,10 +21,12 @@ COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/
 | 
				
			|||||||
RUN chmod a+x /tmp/*.sh \
 | 
					RUN chmod a+x /tmp/*.sh \
 | 
				
			||||||
    && mv /tmp/start-tb-http-transport.sh /usr/bin
 | 
					    && 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 update-rc.d ${pkg.name} disable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER ${pkg.user}
 | 
					USER ${pkg.user}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CMD ["start-tb-http-transport.sh"]
 | 
					CMD ["start-tb-http-transport.sh"]
 | 
				
			||||||
 | 
				
			|||||||
@ -21,10 +21,12 @@ COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/
 | 
				
			|||||||
RUN chmod a+x /tmp/*.sh \
 | 
					RUN chmod a+x /tmp/*.sh \
 | 
				
			||||||
    && mv /tmp/start-tb-mqtt-transport.sh /usr/bin
 | 
					    && 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 update-rc.d ${pkg.name} disable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER ${pkg.user}
 | 
					USER ${pkg.user}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CMD ["start-tb-mqtt-transport.sh"]
 | 
					CMD ["start-tb-mqtt-transport.sh"]
 | 
				
			||||||
 | 
				
			|||||||
@ -21,10 +21,12 @@ COPY start-web-ui.sh ${pkg.name}.deb /tmp/
 | 
				
			|||||||
RUN chmod a+x /tmp/*.sh \
 | 
					RUN chmod a+x /tmp/*.sh \
 | 
				
			||||||
    && mv /tmp/start-web-ui.sh /usr/bin
 | 
					    && 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 update-rc.d ${pkg.name} disable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER ${pkg.user}
 | 
					USER ${pkg.user}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CMD ["start-web-ui.sh"]
 | 
					CMD ["start-web-ui.sh"]
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user