Cleanup, remove fpm and use original apache foreground execserver-16

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

3 files changed, 6 insertions, 48 deletions

diff --git a/server/Dockerfile b/server/Dockerfile
index 67d0444..e8f407d 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
 # Install packages
 RUN apt-get install -y php7.3-cli php7.3-common php7.3-mbstring \
     php7.3-gd php-imagick php7.3-intl php7.3-bz2 php7.3-xml \
-    php7.3-mysql php7.3-zip php7.3-dev curl php7.3-curl php7.3-fpm \
+    php7.3-mysql php7.3-zip php7.3-dev curl php7.3-curl \
     php-dompdf php-apcu redis-server php-redis php-smbclient \
     php7.3-ldap unzip php7.3-pgsql php7.3-sqlite make apache2 \
     php7.3-json php7.3-opcache libmagickcore-6.q16-2-extra \
@@ -36,14 +36,8 @@ RUN chsh -s /bin/bash www-data
 ADD initnc.sh /usr/local/bin/
 ADD run.sh /usr/local/bin/
 ADD initAndRun.sh /usr/local/bin/
-ADD apache2-foreground /usr/local/bin/
 
 RUN chmod +x /usr/local/bin/*
 
-RUN a2enconf php7.3-fpm
-
-# allow php fpm to create its run socket
-RUN mkdir -p /run/php
-
 EXPOSE 80
 ENTRYPOINT ["/usr/local/bin/initAndRun.sh"]
diff --git a/server/apache2-foreground b/server/apache2-foreground
deleted file mode 100755
index 5fe22e2..0000000
--- a/server/apache2-foreground
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-set -e
-
-# Note: we don't just use "apache2ctl" here because it itself is just a shell-script wrapper around apache2 which provides extra functionality like "apache2ctl start" for launching apache2 in the background.
-# (also, when run as "apache2ctl <apache args>", it does not use "exec", which leaves an undesirable resident shell process)
-
-: "${APACHE_CONFDIR:=/etc/apache2}"
-: "${APACHE_ENVVARS:=$APACHE_CONFDIR/envvars}"
-if test -f "$APACHE_ENVVARS"; then
-	. "$APACHE_ENVVARS"
-fi
-
-# Apache gets grumpy about PID files pre-existing
-: "${APACHE_RUN_DIR:=/var/run/apache2}"
-: "${APACHE_PID_FILE:=$APACHE_RUN_DIR/apache2.pid}"
-rm -f "$APACHE_PID_FILE"
-
-# create missing directories
-# (especially APACHE_RUN_DIR, APACHE_LOCK_DIR, and APACHE_LOG_DIR)
-for e in "${!APACHE_@}"; do
-	if [[ "$e" == *_DIR ]] && [[ "${!e}" == /* ]]; then
-		# handle "/var/lock" being a symlink to "/run/lock", but "/run/lock" not existing beforehand, so "/var/lock/something" fails to mkdir
-		#   mkdir: cannot create directory '/var/lock': File exists
-		dir="${!e}"
-		while [ "$dir" != "$(dirname "$dir")" ]; do
-			dir="$(dirname "$dir")"
-			if [ -d "$dir" ]; then
-				break
-			fi
-			absDir="$(readlink -f "$dir" 2>/dev/null || :)"
-			if [ -n "$absDir" ]; then
-				mkdir -p "$absDir"
-			fi
-		done
-
-		mkdir -p "${!e}"
-	fi
-done
-
-exec apache2 -DFOREGROUND "$@"
diff --git a/server/run.sh b/server/run.sh
index e5043bd..f2a1201 100755
--- a/server/run.sh
+++ b/server/run.sh
@@ -5,6 +5,10 @@ cd /var/www/html/
 
 . /etc/apache2/envvars
 
+# allow php and apache2 to create their run socket
+mkdir -p /run/php
+mkdir -p /var/run/apache2
+
 tail -f data/nextcloud.log &
 
-apache2-foreground "$@"
\ No newline at end of file
+apache2 -DFOREGROUND "$@"
\ No newline at end of file