dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop/3.2

Browse Source
This commit is contained in:
Igor Kulikov 2020-08-25 13:06:02 +03:00
commit fce3bdce65
9 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
msa/js-executor/docker/Dockerfile
View File

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-js-executor.sh /usr/bin && mv /tmp/start-js-executor.sh /usr/bin
RUN yes | dpkg -i /tmp/${pkg.name}.deb 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/tb-node/docker/Dockerfile
View File

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-tb-node.sh /usr/bin && mv /tmp/start-tb-node.sh /usr/bin
RUN yes | dpkg -i /tmp/${pkg.name}.deb 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/tb/docker-cassandra/Dockerfile
View File

@ -39,6 +39,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/stop-db.sh /usr/bin && mv /tmp/stop-db.sh /usr/bin
RUN dpkg -i /tmp/${pkg.name}.deb RUN 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/tb/docker-postgres/Dockerfile
View File

@ -35,6 +35,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/stop-db.sh /usr/bin && mv /tmp/stop-db.sh /usr/bin
RUN dpkg -i /tmp/${pkg.name}.deb RUN 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/tb/docker-tb/Dockerfile
View File

@ -26,6 +26,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/stop-db.sh /usr/bin && mv /tmp/stop-db.sh /usr/bin
RUN dpkg -i /tmp/${pkg.name}.deb RUN 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/transport/coap/docker/Dockerfile
View File

@ -22,6 +22,7 @@ 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 yes | dpkg -i /tmp/${pkg.name}.deb 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/transport/http/docker/Dockerfile
View File

@ -22,6 +22,7 @@ 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 yes | dpkg -i /tmp/${pkg.name}.deb 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/transport/mqtt/docker/Dockerfile
View File

@ -22,6 +22,7 @@ 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 yes | dpkg -i /tmp/${pkg.name}.deb 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :

1
msa/web-ui/docker/Dockerfile
View File

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-web-ui.sh /usr/bin && mv /tmp/start-web-ui.sh /usr/bin
RUN yes | dpkg -i /tmp/${pkg.name}.deb 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 systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :