From f0fd6bb44599715aedbd795937197d1efeb2aceb Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Mon, 31 Mar 2025 15:11:03 +0200 Subject: [PATCH] collabora: fix permissions correctly Signed-off-by: Simon L. --- Containers/collabora/Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile index c6b65ff8..26e9aa97 100644 --- a/Containers/collabora/Dockerfile +++ b/Containers/collabora/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:latest -# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker +# From a file located probably somewhere here: https://github.com/CollaboraOnline/online/blob/master/docker/from-packages/Dockerfile FROM collabora/code:24.04.13.2.1 USER root @@ -10,17 +10,13 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ -# # Disable because seems to be failing currently -# # tzdata \ netcat-openbsd \ ; \ - rm -rf /var/lib/apt/lists/*; \ -# Fix permissions for coolwsd.xml file. See https://github.com/CollaboraOnline/online/issues/11345 - chmod +r /etc/coolwsd/coolwsd.xml + rm -rf /var/lib/apt/lists/*; COPY --chmod=775 healthcheck.sh /healthcheck.sh -USER 100 +USER 1001 HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh LABEL com.centurylinklabs.watchtower.enable="false"