Update Dockerfile

Dockerfile

@@ -1,65 +1,33 @@
-# Start with official Nextcloud
 FROM nextcloud:apache
 
-# 1. Install Collabora (CODE)
-# We split this into small steps so the build doesn't time out
-USER root
+# 1. Install Collabora and dependencies
+# We verify the key download to prevent build failures
 RUN apt-get update && apt-get install -y --no-install-recommends \
     wget \
     gnupg \
-    lsb-release \
-    ca-certificates
-
-# Download Key and Add Repo (Specific for Debian Bookworm/Nextcloud)
-RUN wget -qO /usr/share/keyrings/collaboraonline-release-keyring.gpg https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg && \
-    echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian12 ./" > /etc/apt/sources.list.d/collaboraonline.list
-
-# Install the Editor Engine
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    coolwsd \
-    collabora-online-brand && \
-    rm -rf /var/lib/apt/lists/*
-
-# 2. Configure the Editor (Internal)
-# Disable SSL (since HF handles SSL) and allow all domains
-RUN coolconfig set ssl.enable false && \
-    coolconfig set ssl.termination true && \
-    coolconfig set storage.wopi.host ".*"
-
-# 3. Configure Apache (The Web Server)
-# Change Port 80 -> 7860 (Required by HF)
-RUN sed -i 's/80/7860/g' /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
-
-# Enable Apache modules needed to talk to the Editor
-RUN a2enmod proxy proxy_http proxy_wstunnel
-
-# Add the internal connection logic directly to the main config
-# (This connects http://localhost:7860/cool -> http://localhost:9980)
-RUN sed -i '/DocumentRoot/a \
-    ProxyPreserveHost On \n\
-    ProxyPass /browser http://127.0.0.1:9980/browser retry=0 \n\
-    ProxyPassReverse /browser http://127.0.0.1:9980/browser \n\
-    ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0 \n\
-    ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery \n\
-    ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0 \n\
-    ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities \n\
-    ProxyPassMatch "/cool/(.*)/ws$" ws://127.0.0.1:9980/cool/$1/ws nocanon \n\
-    ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws \n\
-    ProxyPass /cool http://127.0.0.1:9980/cool \n\
-    ProxyPassReverse /cool http://127.0.0.1:9980/cool' /etc/apache2/sites-available/000-default.conf
-
-# 4. Startup Script
-# Starts Editor in background, Nextcloud in foreground
+    ca-certificates \
+    && wget -qO /usr/share/keyrings/collaboraonline-release-keyring.gpg https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/collaboraonline-release-keyring.gpg] https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-debian12 ./" > /etc/apt/sources.list.d/collaboraonline.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends coolwsd collabora-online-brand \
+    && rm -rf /var/lib/apt/lists/*
+
+# 2. Basic Setup
+# - Set Apache to Port 7860 (Mandatory for HF Spaces)
+# - Disable Collabora SSL (It runs locally)
+RUN sed -i 's/80/7860/g' /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf \
+    && coolconfig set ssl.enable false \
+    && coolconfig set ssl.termination true
+
+# 3. Simple Start Script
+# Just starts the two services. No complex config injection.
 RUN echo '#!/bin/bash\n\
-# Ensure permissions\n\
-chown -R cool:cool /var/lib/coolwsd /var/cache/coolwsd\n\
-\n\
-echo "Starting Editor..."\n\
+# Start Collabora in background\n\
 su -s /bin/bash cool -c "/usr/bin/coolwsd" &\n\
-\n\
-echo "Starting Nextcloud..."\n\
-exec /entrypoint.sh apache2-foreground' > /start.sh && \
-    chmod +x /start.sh
+# Start Nextcloud in foreground\n\
+exec /entrypoint.sh apache2-foreground' > /start.sh \
+    && chmod +x /start.sh
 
+# 4. Run
 EXPOSE 7860
 CMD ["/start.sh"]