Browse Source

Merge branch 'master' into develop/3.2

pull/3477/head
Igor Kulikov 6 years ago
parent
commit
fce3bdce65
  1. 1
      msa/js-executor/docker/Dockerfile
  2. 1
      msa/tb-node/docker/Dockerfile
  3. 1
      msa/tb/docker-cassandra/Dockerfile
  4. 1
      msa/tb/docker-postgres/Dockerfile
  5. 1
      msa/tb/docker-tb/Dockerfile
  6. 1
      msa/transport/coap/docker/Dockerfile
  7. 1
      msa/transport/http/docker/Dockerfile
  8. 1
      msa/transport/mqtt/docker/Dockerfile
  9. 1
      msa/web-ui/docker/Dockerfile

1
msa/js-executor/docker/Dockerfile

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-js-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 || :

1
msa/tb-node/docker/Dockerfile

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-tb-node.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 || :

1
msa/tb/docker-cassandra/Dockerfile

@ -39,6 +39,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/stop-db.sh /usr/bin
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 || :

1
msa/tb/docker-postgres/Dockerfile

@ -35,6 +35,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/stop-db.sh /usr/bin
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 || :

1
msa/tb/docker-tb/Dockerfile

@ -26,6 +26,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/stop-db.sh /usr/bin
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 || :

1
msa/transport/coap/docker/Dockerfile

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-tb-coap-transport.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 || :

1
msa/transport/http/docker/Dockerfile

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-tb-http-transport.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 || :

1
msa/transport/mqtt/docker/Dockerfile

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-tb-mqtt-transport.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 || :

1
msa/web-ui/docker/Dockerfile

@ -22,6 +22,7 @@ RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-web-ui.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 || :

Loading…
Cancel
Save