docker/Dockerfile | 2 +-
docker/scripts/run-lool.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3b9255bb41d6a14f917bfed03ba8394d53034537
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Tue Jun 25 09:11:06 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jun 25 11:35:50 2019 +0200
Use pkill to kill process instead of killall
Using killall does not work, it gives 'no process found'.
Change-Id: I0e528ab8c0f6f0c4cb06ea5e6c436aecf2274688
Reviewed-on: https://gerrit.libreoffice.org/74679
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 164a6f6af..d8109f1ea 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get upgrade -y
# install LibreOffice run-time dependencies
# install adduser, findutils, openssl and cpio that we need later
# install an editor
-RUN apt-get -y install locales-all libpng16-16 libxinerama1 libgl1-mesa-glx
libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio
findutils nano libpoco*50 libcap2-bin openssl inotify-tools psmisc
+RUN apt-get -y install locales-all libpng16-16 libxinerama1 libgl1-mesa-glx
libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio
findutils nano libpoco*50 libcap2-bin openssl inotify-tools procps
# tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei
fonts-droid-fallback fonts-noto-cjk
diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index bc0ef7d64..b76b43ee6 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -36,10 +36,10 @@ perl -pi -e "s/<password (.*)>.*<\/password>/<password
\1>${password}<\/password
# Restart when /etc/loolwsd/loolwsd.xml changes
-[ -x /usr/bin/inotifywait -a /usr/bin/killall ] && (
+[ -x /usr/bin/inotifywait -a /usr/bin/pkill ] && (
/usr/bin/inotifywait -e modify /etc/loolwsd/loolwsd.xml
echo "$(ls -l /etc/loolwsd/loolwsd.xml) modified --> restarting"
- /usr/bin/killall -1 loolwsd
+ pkill -f --signal 1 loolwsd
) &
# Start loolwsd
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
