Update Dockerfile

Dockerfile

@@ -2,81 +2,49 @@ FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# --------------------------
-# Install dependencies
-# --------------------------
+# --- Update Base ---
 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 \
+    apt-transport-https \
+    ca-certificates \
+    gnupg \
+    wget \
+    software-properties-common \
     supervisor \
-    libreoffice \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+    && 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 Apache + PHP for Nextcloud ---
+RUN apt-get update && apt-get install -y \
+    apache2 \
+    libapache2-mod-php \
+    php php-gd php-mbstring php-xml php-zip php-curl php-intl php-mysql php-bz2 php-imagick php-gmp php-json php-ldap \
+    && rm -rf /var/lib/apt/lists/*
 
-# --------------------------
-# 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 loolwsd code-brand \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+# --- Download Nextcloud ---
+WORKDIR /var/www/html
+RUN wget https://download.nextcloud.com/server/releases/latest.tar.bz2 && \
+    tar -xjf latest.tar.bz2 && \
+    rm latest.tar.bz2 && \
+    chown -R www-data:www-data nextcloud
 
-# --------------------------
-# 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
+# Change Apache port to 7890
+RUN sed -i 's/80/7890/g' /etc/apache2/ports.conf && \
+    sed -i 's/<VirtualHost \*:80>/<VirtualHost \*:7890>/' /etc/apache2/sites-available/000-default.conf
 
-# --------------------------
-# Supervisor config
-# --------------------------
-RUN mkdir -p /etc/supervisor/conf.d
+# --- Install Collabora CODE ---
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7A4D1868 && \
+    echo "deb https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb/ /" \
+        > /etc/apt/sources.list.d/collabora.list && \
+    apt-get update && apt-get install -y code-brand code \
+    && rm -rf /var/lib/apt/lists/*
 
-# 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 default config
+RUN sed -i 's/0.0.0.0:9980/0.0.0.0:9980/' /etc/collabora-online/coolwsd.xml
 
-# 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'
+# --- Supervisor Config ---
+RUN mkdir -p /var/log/supervisor
 
-# MariaDB service
-RUN bash -c 'cat > /etc/supervisor/conf.d/mariadb.conf <<EOF
-[program:mariadb]
-command=/usr/sbin/mysqld
-autostart=true
-autorestart=true
-EOF'
+COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
-# --------------------------
-# Expose ports
-# --------------------------
-EXPOSE 80 9980
+EXPOSE 7890 9980
 
-# --------------------------
-# Launch supervisor
-# --------------------------
 CMD ["/usr/bin/supervisord", "-n"]