From 787fa22a81af741aa2c39ad31684fa08ac9e679d Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Wed, 17 Jun 2026 12:12:06 +0200 Subject: [PATCH] remove the `registry.gitlab.collabora.com/collabora-online/docker:latest` image Signed-off-by: Simon L. --- Containers/collabora-online/Dockerfile | 22 ---------------------- Containers/collabora-online/healthcheck.sh | 7 ------- nextcloud-aio-helm-chart/update-helm.sh | 15 --------------- php/src/ContainerDefinitionFetcher.php | 3 --- php/src/Data/ConfigurationManager.php | 4 ---- 5 files changed, 51 deletions(-) delete mode 100644 Containers/collabora-online/Dockerfile delete mode 100644 Containers/collabora-online/healthcheck.sh diff --git a/Containers/collabora-online/Dockerfile b/Containers/collabora-online/Dockerfile deleted file mode 100644 index 89f9ccbf..00000000 --- a/Containers/collabora-online/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# syntax=docker/dockerfile:latest -# From https://gitlab.collabora.com/collabora-online/docker -# hadolint ignore=DL3007 -FROM registry.gitlab.collabora.com/collabora-online/docker:latest - -USER root -ARG DEBIAN_FRONTEND=noninteractive - -COPY --chmod=775 healthcheck.sh /healthcheck.sh - -USER 1001 - -HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh -LABEL com.centurylinklabs.watchtower.enable="false" \ - wud.watch="false" \ - dockhand.update="false" \ - org.opencontainers.image.title="Collabora Online for Nextcloud AIO" \ - org.opencontainers.image.description="Collabora Online document editor from upstream for Nextcloud All-in-One" \ - org.opencontainers.image.url="https://github.com/nextcloud/all-in-one" \ - org.opencontainers.image.source="https://github.com/nextcloud/all-in-one" \ - org.opencontainers.image.vendor="Nextcloud" \ - org.opencontainers.image.documentation="https://github.com/nextcloud/all-in-one/blob/main/readme.md" diff --git a/Containers/collabora-online/healthcheck.sh b/Containers/collabora-online/healthcheck.sh deleted file mode 100644 index 45e9278b..00000000 --- a/Containers/collabora-online/healthcheck.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# Unfortunately, no curl and no nc is installed in the container -# and packages can also not be added as the package list is broken. -# So always exiting 0 for now. -# nc http://127.0.0.1:9980 || exit 1 -exit 0 diff --git a/nextcloud-aio-helm-chart/update-helm.sh b/nextcloud-aio-helm-chart/update-helm.sh index ea2319aa..8c99fc21 100755 --- a/nextcloud-aio-helm-chart/update-helm.sh +++ b/nextcloud-aio-helm-chart/update-helm.sh @@ -343,21 +343,6 @@ EOL # shellcheck disable=SC1083 find ./ -name '*talk-deployment.yaml' -exec sed -i "/^.*\- env:/r /tmp/additional-talk.config" \{} \; -# Additional collabora config -# shellcheck disable=SC1083 -find ./ -name '*collabora-deployment.yaml' -exec sed -i "s/image: ghcr.io.*/IMAGE_PLACEHOLDER/" \{} \; -cat << EOL > /tmp/additional-collabora.config - {{- if contains "--o:support_key=" (join " " (.Values.ADDITIONAL_COLLABORA_OPTIONS | default list)) }} - image: ghcr.io/nextcloud-releases/aio-collabora-online:$DOCKER_TAG - {{- else }} - image: ghcr.io/nextcloud-releases/aio-collabora:$DOCKER_TAG - {{- end }} -EOL -# shellcheck disable=SC1083 -find ./ -name '*collabora-deployment.yaml' -exec sed -i "/IMAGE_PLACEHOLDER/r /tmp/additional-collabora.config" \{} \; -# shellcheck disable=SC1083 -find ./ -name '*collabora-deployment.yaml' -exec sed -i "/IMAGE_PLACEHOLDER/d" \{} \; - cat << EOL > templates/nextcloud-aio-networkpolicy.yaml {{- if eq .Values.NETWORK_POLICY_ENABLED "yes" }} # https://github.com/ahmetb/kubernetes-network-policy-recipes/blob/master/04-deny-traffic-from-other-namespaces.md diff --git a/php/src/ContainerDefinitionFetcher.php b/php/src/ContainerDefinitionFetcher.php index fa49f39b..7fb8604a 100644 --- a/php/src/ContainerDefinitionFetcher.php +++ b/php/src/ContainerDefinitionFetcher.php @@ -86,9 +86,6 @@ readonly class ContainerDefinitionFetcher { if (!$this->configurationManager->isCollaboraEnabled) { continue; } - if ($this->configurationManager->isCollaboraSubscriptionEnabled()) { - $entry['image'] = 'ghcr.io/nextcloud-releases/aio-collabora-online'; - } } elseif ($entry['container_name'] === 'nextcloud-aio-talk') { if (!$this->configurationManager->isTalkEnabled) { continue; diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php index 3bbbd60d..a75a4c16 100644 --- a/php/src/Data/ConfigurationManager.php +++ b/php/src/Data/ConfigurationManager.php @@ -963,10 +963,6 @@ class ConfigurationManager } } - public function isCollaboraSubscriptionEnabled() : bool { - return str_contains($this->collaboraAdditionalOptions, '--o:support_key='); - } - /** * Provide an extra method since the corresponding attribute setter prevents setting an empty value. */