Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker simplifications and improvements #7288

Merged
merged 4 commits into from
Sep 28, 2023
Merged

Docker simplifications and improvements #7288

merged 4 commits into from
Sep 28, 2023

Conversation

timar
Copy link
Member

@timar timar commented Sep 23, 2023

  • Target version: 23.05.5

Summary

Simplifications and improvements after @Minion3665's work.

Details

  • with PR Add cli option to use settings from env variables #7160 we could get rid of docker/from-packages/scripts/start-collabora-online.pl and chunks of docker/from-packages/scripts/start-collabora-online.sh
  • with PR Stop coolwsd when /etc/coolwsd/coolwsd.xml changes #7145 we could get rid of the inotify-tools dependency
  • SAL_LOG setting was unnecessarily duplicated here, by default core logging is disabled in coolwsd.xml
  • Generation of WOPI Proof Key is not necessarry here, as it is better to generate and maintain it outside of the container, and mount it, if needed.

TODO

  • get rid of docker/from-packages/scripts/start-collabora-online.sh. The last bit there is automatic SSL cert generation.
  • update docs, if someone does not want automatic restart after config file change, then --o:stop_on_config_change=false should be passed in extra_params, but I don't think it's a common use case, when config files change in the container which should be immutable ans stateless anyway.

…sd.xml

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I80bdc3a2b8fa6f571624395ed8c1917eb241b0cd
…mmand

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I74e16827bd7033fe3a2282da562b35cc9bfc3eb4
…nally

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I4141546c4ab281dfe749b16b119eb9de46fd9e67
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ib6267c05e687a64d5a2e4df2a1d42c33e001f999
@timar timar merged commit 2e86ea4 into master Sep 28, 2023
11 of 12 checks passed
@timar timar deleted the private/timar/docker branch September 28, 2023 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants