diff --git a/msa/js-executor/docker/Dockerfile b/msa/js-executor/docker/Dockerfile index d210a4dbb3..701d44b6c7 100644 --- a/msa/js-executor/docker/Dockerfile +++ b/msa/js-executor/docker/Dockerfile @@ -23,7 +23,7 @@ RUN chmod a+x /tmp/*.sh \ RUN yes | dpkg -i /tmp/${pkg.name}.deb -RUN update-rc.d ${pkg.name} disable +RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name} diff --git a/msa/transport/coap/docker/Dockerfile b/msa/transport/coap/docker/Dockerfile index 5f297cdc4d..ad92c10d42 100644 --- a/msa/transport/coap/docker/Dockerfile +++ b/msa/transport/coap/docker/Dockerfile @@ -23,7 +23,7 @@ RUN chmod a+x /tmp/*.sh \ RUN yes | dpkg -i /tmp/${pkg.name}.deb -RUN update-rc.d ${pkg.name} disable +RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar diff --git a/msa/transport/http/docker/Dockerfile b/msa/transport/http/docker/Dockerfile index 32d3bdaf98..a8257e49a7 100644 --- a/msa/transport/http/docker/Dockerfile +++ b/msa/transport/http/docker/Dockerfile @@ -23,7 +23,7 @@ RUN chmod a+x /tmp/*.sh \ RUN yes | dpkg -i /tmp/${pkg.name}.deb -RUN update-rc.d ${pkg.name} disable +RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar diff --git a/msa/transport/mqtt/docker/Dockerfile b/msa/transport/mqtt/docker/Dockerfile index cc3b90e570..c2ce4f5629 100644 --- a/msa/transport/mqtt/docker/Dockerfile +++ b/msa/transport/mqtt/docker/Dockerfile @@ -23,7 +23,7 @@ RUN chmod a+x /tmp/*.sh \ RUN yes | dpkg -i /tmp/${pkg.name}.deb -RUN update-rc.d ${pkg.name} disable +RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar diff --git a/msa/web-ui/docker/Dockerfile b/msa/web-ui/docker/Dockerfile index 7f6178111b..f31504d3dc 100644 --- a/msa/web-ui/docker/Dockerfile +++ b/msa/web-ui/docker/Dockerfile @@ -23,7 +23,7 @@ RUN chmod a+x /tmp/*.sh \ RUN yes | dpkg -i /tmp/${pkg.name}.deb -RUN update-rc.d ${pkg.name} disable +RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name} diff --git a/packaging/java/build.gradle b/packaging/java/build.gradle index 5b1d725e5d..3f436a7410 100644 --- a/packaging/java/build.gradle +++ b/packaging/java/build.gradle @@ -174,7 +174,6 @@ buildDeb { } } - link("/etc/init.d/${pkgName}", "${pkgInstallFolder}/bin/${pkgName}.jar") link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml") link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") } diff --git a/packaging/js/scripts/control/deb/postinst b/packaging/js/scripts/control/deb/postinst index 729676a8ee..7c2e6ed408 100644 --- a/packaging/js/scripts/control/deb/postinst +++ b/packaging/js/scripts/control/deb/postinst @@ -3,5 +3,6 @@ mkdir -m 0755 -p ${pkg.logFolder} chown -R ${pkg.user}: ${pkg.logFolder} chown -R ${pkg.user}: ${pkg.installFolder} -update-rc.d ${pkg.name} defaults + +systemctl --no-reload enable ${pkg.name}.service >/dev/null 2>&1 || : diff --git a/packaging/js/scripts/control/deb/postrm b/packaging/js/scripts/control/deb/postrm index 61865803c3..b26d46634a 100644 --- a/packaging/js/scripts/control/deb/postrm +++ b/packaging/js/scripts/control/deb/postrm @@ -1,3 +1,8 @@ #!/bin/sh -update-rc.d -f ${pkg.name} remove +set -e + +systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : + +exit 0 +