Commit graph

14 commits

Author SHA1 Message Date
Sam Litvin
433c01982c Update start-collabora-online.sh
There is no reason why the UI mode should be set here where it over-rides the setting in loolwsd.xml.

Change-Id: I5f4ecd61dba96831dec28e7d3175718c8d63287c
Signed-off-by: litvin-Millogic <sam-linux@litvinhome.net>
2021-11-09 10:12:30 +01:00
Ashod Nakashian
e1ff82324e docker: exec the startup script to intercept SIGTERM
Docker supports two methods of executing commands.
The existing approach was to run bash and give the
shell script to execute, which forks and execs another
shell instance to run the script. This means that the
script itself is not PID 1, rather the parent bash
instance is.
The second approach is to exec the script in the same
bash process, without a parent. This is exactly what
we want, because once our script is done, it execs
loolwsd, thereby making loolwsd PID 1.

All of this means that when the docker container is
stopped, and PID 1 is sent SIGTERM, loolwsd will
intercept it and gracefully shutdown.

Change-Id: I52ac63f7fba58d20d1c6f63c7e07dd18141c1af4
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2021-10-12 09:36:33 +02:00
Andras Timar
741221f122 do not use deprecated apt-key command (fixes #1934)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Iefbcdcc18a9c1dfcb8e6b57abfa17ed29b81355d
2021-08-23 13:52:16 +02:00
Michael Meeks
7b89840798 docker: only substitute variables when they are set.
Clobbering a copied-in config un-necessarily is impolite.

Change-Id: I9eec5711d12def987f2ae08f9e6bd77f1636780e
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2021-08-10 20:40:22 +01:00
Andras Timar
3537f06d75 docker: install libnss3 on aarch64
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ifbfa06052bf7af72beacbefe672db93e52a812ed
2021-04-06 13:39:30 +02:00
Yunusemre Şentürk
27365caf98 Use CODE arm64 repository while the base OS architecture is aarch64
when creating docker image

Change-Id: I8562b5bbccc50d11c6b8110a4791fa9592eff6b8
Signed-off-by: Yunusemre Şentürk <yunusemre@collabora.com>
2021-04-06 12:21:21 +03:00
Andras Timar
8b0af828ef Revert "docker: do not modify loolwsd.xml, use command line parameters instead"
This reverts commit 93dfff7dad.
Reason: #1264 and #1235
2021-01-18 15:12:29 +01:00
Ashod Nakashian
3e86ed373c docker: disable logging colors
Colors in docker only add noise in the form
of the escape codes around the log entries.
Best to disable colored logging in docker.

Change-Id: I15c62910856eb37e41585be7b7bbe78ce5456283
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2020-12-09 17:19:58 +01:00
Andras Timar
d8bda129d7 docker: narrow down permission changes, binaries in systemplate should be owned by root
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I371c8445c12a10d52c4645a460d626a8a0e0e33b
2020-12-04 21:23:11 +01:00
Andras Timar
93dfff7dad docker: do not modify loolwsd.xml, use command line parameters instead
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I12b1791ef9480cb3391caf292d0e9208323765e0
2020-12-04 15:02:15 +01:00
Andras Timar
418743df89 systemd was installed for /etc/localtime, so numeric user id of lool shifted to 104
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ibdbc54eeddc47bbe5a1a852b8d1319299b5fa837
2020-12-01 12:38:50 +01:00
Andras Timar
99bd298878 docker: fix syntax error and a typo
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ia2eb07301efeaed4350571657fb6a21280b4c2de
2020-11-27 12:32:24 +01:00
Andras Timar
75947daccc docker: RHEL8: Install cpio (missing dependency needed by loolwsd-systemplate-setup)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I0224e3bcabf84fb44e5ec9937bd0e765f5a64324
2020-11-23 15:22:28 +01:00
Andras Timar
34b8ff08f6 Docker bits
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I4b4d8f9d6ccb8648d5d75e6abff751d1b37e8773
2020-11-22 22:19:34 +01:00