From cddffeaf2501f3b79452679a3d3f322657807508 Mon Sep 17 00:00:00 2001
From: Muhamad Aditya Prima <aprimediet@gmail.com>
Date: Fri, 27 Dec 2024 15:18:29 +0700
Subject: [PATCH] fixed apache dockerfile

---
 7/Dockerfile.alpine-apache                    | 10 +--
 Dockerfile.alpine-apache                      | 61 -------------------
 Dockerfile.ubi9 => unused/Dockerfile.ubi9     |  0
 .../Dockerfile.ubi9-apache                    |  0
 .../Dockerfile.ubi9-micro                     |  0
 .../Dockerfile.ubi9-micro-apache              |  0
 Dockerfile.ubuntu => unused/Dockerfile.ubuntu |  0
 7 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 Dockerfile.alpine-apache
 rename Dockerfile.ubi9 => unused/Dockerfile.ubi9 (100%)
 rename Dockerfile.ubi9-apache => unused/Dockerfile.ubi9-apache (100%)
 rename Dockerfile.ubi9-micro => unused/Dockerfile.ubi9-micro (100%)
 rename Dockerfile.ubi9-micro-apache => unused/Dockerfile.ubi9-micro-apache (100%)
 rename Dockerfile.ubuntu => unused/Dockerfile.ubuntu (100%)

diff --git a/7/Dockerfile.alpine-apache b/7/Dockerfile.alpine-apache
index e2710c6..0e5515a 100644
--- a/7/Dockerfile.alpine-apache
+++ b/7/Dockerfile.alpine-apache
@@ -6,19 +6,21 @@ ARG PHP_VERSION=7.4
 
 FROM quay.io/sindigilive/php:${PHP_VERSION}-builder-alpine AS builder
 
-ARG WITH_APACHE=false
+USER root
+
+ARG WITH_APACHE=true
 ARG WITH_DATABASE=false
 
 ENV WITH_APACHE=${WITH_APACHE}
 ENV WITH_DATABASE=${WITH_DATABASE}
 
-ADD ./scripts/apache-entrypoint.sh /usr/local/bin/entrypoint.sh ;
+ADD scripts/apache-entrypoint.sh /usr/local/bin/entrypoint
 
 # Create directory, and install required php app
 RUN /bin/sh /tmp/setup.sh; \
     /bin/rm -f /tmp/*.sh; \
     rm -vrf /var/cache/apk/*; \
-    chmod +rx /usr/local/bin/entrypoint.sh ;
+    chmod +rx /usr/local/bin/entrypoint ;
 
 FROM scratch
 
@@ -47,4 +49,4 @@ WORKDIR /app/htdocs
 
 STOPSIGNAL SIGQUIT
 
-CMD ["/usr/local/bin/entrypoint.sh"]
+CMD ["/usr/local/bin/entrypoint"]
diff --git a/Dockerfile.alpine-apache b/Dockerfile.alpine-apache
deleted file mode 100644
index 856d724..0000000
--- a/Dockerfile.alpine-apache
+++ /dev/null
@@ -1,61 +0,0 @@
-ARG REGISTRY_URL=docker.io/aprimediet
-ARG PHP=8.3
-
-FROM ${REGISTRY_URL}/php:${PHP}-alpine
-LABEL maintainer="<Muhamad Aditya Prima> aprimediet@gmail.com"
-
-# DEFINE ENV
-ENV SERVER_ROOT=/app
-ENV SERVER_ADMIN=you@example.com
-ENV APP_DIR=${SERVER_ROOT}/htdocs
-ENV LOG_LEVEL=info
-ENV PHP_MEMORY_LIMIT=256M
-
-# SET WORKDIR
-WORKDIR /tmp
-
-# SETUP APACHE2 USER
-RUN addgroup -g 10001 apache && \
-    adduser -D -u 10001 -G apache -s /bin/sh -h ${APP_DIR} apache
-
-# INSTALL APACHE2
-RUN --mount=type=cache,target=/var/cache/apk \
-    apk upgrade && apk add --update \
-    apache2 php${PHP_VERSION}-apache2
-
-# CREATE SYMLINKS TO /app
-RUN mkdir -p ${APP_DIR} && \
-    mkdir -p ${SERVER_ROOT}/logs && \
-    mkdir -p ${SERVER_ROOT}/run && \
-    ln -s /usr/lib/apache2 ${SERVER_ROOT}/modules && \
-    chmod -R 755 ${SERVER_ROOT}/logs && \
-    chmod -R 755 ${SERVER_ROOT/run}
-
-# CONFIGURE HTTPD
-RUN sed -i "s|ServerRoot /var/www|ServerRoot ${SERVER_ROOT}|" /etc/apache2/httpd.conf && \
-    sed -i "s|ServerAdmin you@example.com| ServerAdmin ${SERVER_ADMIN}|" /etc/apache2/httpd.conf && \
-    sed -i "s|DocumentRoot \"/var/www/localhost/htdocs\"|DocumentRoot \"${APP_DIR}\"|" /etc/apache2/httpd.conf && \
-    sed -i "s|Directory \"/var/www/localhost/htdocs\"|Directory \"${APP_DIR}\"|" /etc/apache2/httpd.conf && \
-    sed -i "s|AllowOverride None|AllowOverride All|" /etc/apache2/httpd.conf && \
-    sed -i "s|ErrorLog .*|ErrorLog /dev/stderr \nTransferLog /dev/stdout|" /etc/apache2/httpd.conf && \
-    sed -i "s|CustomLog .* combined|CustomLog /dev/stdout combined|" /etc/apache2/httpd.conf && \
-    sed -i "s|LogLevel .*|LogLevel ${LOG_LEVEL}|" /etc/apache2/httpd.conf && \
-    sed -i "s|#LoadModule rewrite_module|LoadModule rewrite_module|" /etc/apache2/httpd.conf && \
-    sed -i "s|#LoadModule deflate_module|LoadModule deflate_module|" /etc/apache2/httpd.conf && \
-    sed -i "s|#LoadModule expires_module|LoadModule expires_module|" /etc/apache2/httpd.conf && \
-    sed -i "s|Require host .example.com|#Require host .example.com|" /etc/apache2/conf.d/info.conf && \
-    sed -i "s|Require ip 127|Require all granted|" /etc/apache2/conf.d/info.conf
-
-# ADD INITIALIZATION SCRIPT
-ADD ./scripts/entrypoint /usr/local/bin/entrypoint
-
-RUN chmod +x /usr/local/bin/entrypoint && \
-    cp -vR /var/www/localhost/htdocs/* ${APP_DIR}/ && \
-    rm -vrf /var/www && \
-    chown -R apache:apache ${APP_DIR}
-
-WORKDIR ${APP_DIR}
-
-EXPOSE 80
-
-ENTRYPOINT ["/usr/local/bin/entrypoint"]
diff --git a/Dockerfile.ubi9 b/unused/Dockerfile.ubi9
similarity index 100%
rename from Dockerfile.ubi9
rename to unused/Dockerfile.ubi9
diff --git a/Dockerfile.ubi9-apache b/unused/Dockerfile.ubi9-apache
similarity index 100%
rename from Dockerfile.ubi9-apache
rename to unused/Dockerfile.ubi9-apache
diff --git a/Dockerfile.ubi9-micro b/unused/Dockerfile.ubi9-micro
similarity index 100%
rename from Dockerfile.ubi9-micro
rename to unused/Dockerfile.ubi9-micro
diff --git a/Dockerfile.ubi9-micro-apache b/unused/Dockerfile.ubi9-micro-apache
similarity index 100%
rename from Dockerfile.ubi9-micro-apache
rename to unused/Dockerfile.ubi9-micro-apache
diff --git a/Dockerfile.ubuntu b/unused/Dockerfile.ubuntu
similarity index 100%
rename from Dockerfile.ubuntu
rename to unused/Dockerfile.ubuntu