avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-08-20 11:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(collabora): stop masking required setup failures

Browse Source
This commit is contained in:
Alexandre
2026-07-26 19:41:22 +02:00
parent c10801ae75
commit ae2c19074a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
collabora/Dockerfile
View File

@@ -101,7 +101,7 @@ ENV PACKAGES="ca-certificates cpio findutils fontconfig libcap2-bin libstdc++6 o
# Automatic apps & bashio # Automatic apps & bashio
COPY ha_autoapps.sh /ha_autoapps.sh COPY ha_autoapps.sh /ha_autoapps.sh
RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" || true && rm /ha_autoapps.sh RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
# Collabora Online payload, taken from the official image. COPY --from keeps the # Collabora Online payload, taken from the official image. COPY --from keeps the
# numeric ownership, so /opt/cool and /etc/coolwsd arrive already owned by 1001. # numeric ownership, so /opt/cool and /etc/coolwsd arrive already owned by 1001.
@@ -123,7 +123,7 @@ RUN \
chown 1001:1001 /var/log/coolwsd.log && \ chown 1001:1001 /var/log/coolwsd.log && \
# the WOPI proof key must be unique per container, not baked into the image # the WOPI proof key must be unique per container, not baked into the image
rm -rf /etc/coolwsd/proof_key* && \ rm -rf /etc/coolwsd/proof_key* && \
fc-cache /opt/collaboraoffice/share/fonts/truetype > /dev/null 2>&1 || true (fc-cache /opt/collaboraoffice/share/fonts/truetype > /dev/null 2>&1 || true)
# Restore the file capabilities. The official image carries them as extended # Restore the file capabilities. The official image carries them as extended
# attributes on two binaries: # attributes on two binaries:
@@ -151,9 +151,9 @@ RUN \
*) echo "coolmount lost its capabilities: ${caps}"; exit 1 ;; \ *) echo "coolmount lost its capabilities: ${caps}"; exit 1 ;; \
esac esac
# Fail the build rather than ship an image that cannot start: ha_autoapps.sh is # Fail the build rather than ship an image with unresolved runtime dependencies.
# invoked with "|| true", and the payload was linked against the libraries of # The payload was linked against the libraries of the distroless image, so each
# the distroless image, so both are worth proving here. # executable and shared library is checked against the Debian runtime.
# #
# coolwsd itself cannot be executed as a smoke test. It refuses to run as root # coolwsd itself cannot be executed as a smoke test. It refuses to run as root
# ("Do not run as root. Please run as cool user.", exit 78), and --version does # ("Do not run as root. Please run as cool user.", exit 78), and --version does