From d8ad483115498f83051c19b5a64cdae292b02d56 Mon Sep 17 00:00:00 2001
From: Michael Balsillie <michael@balsillie.net>
Date: Mon, 17 Apr 2023 04:31:08 +0200
Subject: [PATCH] switch to apache image

---
 Dockerfile       | 4 ++--
 build.sh         | 2 +-
 supervisord.conf | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2180d8c..7064650 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 # Base image
 ARG NEXTCLOUD_VER
-FROM nextcloud:${NEXTCLOUD_VER}-fpm
+FROM nextcloud:${NEXTCLOUD_VER}-apache
 
 # Install extra utilities
 
 RUN apt update && \
     apt install -y --no-install-recommends \
-        sudo \
+        # sudo \
         nano \
         nfs-common \
         libreoffice \
diff --git a/build.sh b/build.sh
index ee3bcd7..8598ffb 100755
--- a/build.sh
+++ b/build.sh
@@ -5,6 +5,6 @@ REGISTRY="code.balsillie.net"
 ORG="containers"
 IMAGE="nextcloud-supervisord"
 IMAGE_FULL="$REGISTRY/$ORG/$IMAGE"
-docker build --pull -f ./Dockerfile --build-arg NEXTCLOUD_VER=$NEXTCLOUD_VER -t "$IMAGE_FULL:$NEXTCLOUD_VER" -t "$IMAGE_FULL:$DATE_TAG" .
+docker build --no-cache --pull -f ./Dockerfile --build-arg NEXTCLOUD_VER=$NEXTCLOUD_VER -t "$IMAGE_FULL:$NEXTCLOUD_VER" -t "$IMAGE_FULL:$DATE_TAG" .
 docker push -a "$IMAGE_FULL"
 
diff --git a/supervisord.conf b/supervisord.conf
index 4f76259..526729a 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -7,12 +7,13 @@ logfile_maxbytes=50MB                           ; maximum size of logfile before
 logfile_backups=10                              ; number of backed up logfiles
 loglevel=error
 
-[program:php-fpm]
+[program:apache2]
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
-command=php-fpm
+# command=php-fpm
+command=apache2-foreground
 
 [program:cron]
 stdout_logfile=/dev/stdout