From 9d72bfee4a0695657b8aab7170f716b9ea0d8675 Mon Sep 17 00:00:00 2001
From: Jonas Leder <jonas@jonasled.de>
Date: Mon, 16 Aug 2021 20:52:04 +0200
Subject: [PATCH] use custom apache image

---
 Dockerfile       | 31 +++----------------------------
 httpd-foreground |  7 -------
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100755 httpd-foreground

diff --git a/Dockerfile b/Dockerfile
index 18fb59f..9d54245 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,40 +14,15 @@ COPY --from=buildJS /build /build
 RUN cd /build/public/API && composer install
 
 # Prepare Webserver
-FROM alpine:latest
+FROM gitlab.jonasled.de/jonasled/apache-php-minimal:latest
 
 # |--------------------------------------------------------------------------
 # | install dependencies
 # |--------------------------------------------------------------------------
 RUN apk update && \
-    apk upgrade && \
-    apk add apache2 php8-apache2 php8-mysqli php8-mbstring curl && \
-    rm /var/www/localhost/htdocs/ -R
+    apk add php8-mysqli php8-mbstring curl
 
 # |--------------------------------------------------------------------------
 # | copy website from node build
 # |--------------------------------------------------------------------------
-COPY --from=composer /build/public /var/www/localhost/htdocs/
-
-# |--------------------------------------------------------------------------
-# | enable apache modules
-# |--------------------------------------------------------------------------
-RUN sed -i '/LoadModule rewrite_module/s/^#//g' /etc/apache2/httpd.conf && \
-    sed -i 's#AllowOverride [Nn]one#AllowOverride All#' /etc/apache2/httpd.conf
-
-# |--------------------------------------------------------------------------
-# | enable healthcheck
-# |--------------------------------------------------------------------------
-HEALTHCHECK CMD curl --fail http://localhost || exit 1  
-
-# |--------------------------------------------------------------------------
-# | expose http port
-# |--------------------------------------------------------------------------
-EXPOSE 80
-
-# |--------------------------------------------------------------------------
-# | set entrypoint
-# |--------------------------------------------------------------------------
-COPY httpd-foreground /usr/local/bin/
-RUN chmod +x /usr/local/bin/httpd-foreground
-CMD ["httpd-foreground"]
\ No newline at end of file
+COPY --from=composer /build/public /var/www/localhost/htdocs/
\ No newline at end of file
diff --git a/httpd-foreground b/httpd-foreground
deleted file mode 100755
index e896168..0000000
--- a/httpd-foreground
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-# Apache gets grumpy about PID files pre-existing
-rm -f /usr/local/apache2/logs/httpd.pid
-
-exec httpd -DFOREGROUND "$@"
-- 
GitLab