Update Dockerfile

Dockerfile

@@ -1,33 +1,82 @@
-FROM nextcloud:apache
-
-# 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 \
-    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 \
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# --------------------------
+# Install dependencies
+# --------------------------
+RUN apt-get update && apt-get install -y \
+    apache2 \
+    php php-fpm php-gd php-xml php-mbstring php-zip php-curl php-mysql \
+    php-intl php-bz2 php-imagick php-gmp php-bcmath \
+    mariadb-server \
+    wget curl gnupg lsb-release apt-transport-https \
+    supervisor \
+    libreoffice \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# --------------------------
+# Install Nextcloud
+# --------------------------
+WORKDIR /var/www/html
+RUN wget https://download.nextcloud.com/server/releases/latest.tar.bz2 \
+    && tar -xjf latest.tar.bz2 --strip 1 \
+    && rm latest.tar.bz2 \
+    && chown -R www-data:www-data /var/www/html
+
+# --------------------------
+# Install Collabora CODE
+# --------------------------
+RUN echo "deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb/ /" \
+    | tee /etc/apt/sources.list.d/collabora.list \
+    && wget --no-check-certificate \
+       https://collaboraoffice.com/repos/CollaboraOnline/CODE-deb-key.gpg \
+       -O /etc/apt/trusted.gpg.d/collabora.gpg \
     && 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\
-# Start Collabora in background\n\
-su -s /bin/bash cool -c "/usr/bin/coolwsd" &\n\
-# Start Nextcloud in foreground\n\
-exec /entrypoint.sh apache2-foreground' > /start.sh \
-    && chmod +x /start.sh
-
-# 4. Run
-EXPOSE 7860
-CMD ["/start.sh"]
+    && apt-get install -y loolwsd code-brand \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# --------------------------
+# Configure Apache (Nextcloud)
+# --------------------------
+RUN a2enmod rewrite headers env dir mime setenvif ssl proxy proxy_wstunnel
+RUN chown -R www-data:www-data /var/www/html
+
+# --------------------------
+# Supervisor config
+# --------------------------
+RUN mkdir -p /etc/supervisor/conf.d
+
+# Apache service
+RUN bash -c 'cat > /etc/supervisor/conf.d/apache.conf <<EOF
+[program:apache2]
+command=/usr/sbin/apachectl -D FOREGROUND
+autostart=true
+autorestart=true
+EOF'
+
+# Collabora service
+RUN bash -c 'cat > /etc/supervisor/conf.d/collabora.conf <<EOF
+[program:collabora]
+command=/usr/bin/loolwsd --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:storage.filesystem[@allow]=true
+autostart=true
+autorestart=true
+EOF'
+
+# MariaDB service
+RUN bash -c 'cat > /etc/supervisor/conf.d/mariadb.conf <<EOF
+[program:mariadb]
+command=/usr/sbin/mysqld
+autostart=true
+autorestart=true
+EOF'
+
+# --------------------------
+# Expose ports
+# --------------------------
+EXPOSE 80 9980
+
+# --------------------------
+# Launch supervisor
+# --------------------------
+CMD ["/usr/bin/supervisord", "-n"]