apache2ctl

apache/Dockerfile

@@ -66,28 +66,22 @@ COPY ./apache/libapache2 /lauth/apache/libapache2
 WORKDIR /lauth/apache/libapache2
 
 # http-check
-RUN mkdir -p /lauth/apache/libapache2/http-check/usr/bin
 COPY --from=module /lauth/apache/build/http-check /lauth/apache/libapache2/http-check/usr/bin/
 RUN ./http-check/DEBIAN/package
 
 # mod-authn-remoteuser
-RUN mkdir -p /lauth/apache/libapache2/mod-authn-remoteuser/usr/lib/apache2/modules
 COPY --from=module /usr/lib/apache2/modules/mod_authn_remoteuser.so /lauth/apache/libapache2/mod-authn-remoteuser/usr/lib/apache2/modules/
 RUN ./mod-authn-remoteuser/DEBIAN/package
 
 # mod-lauth
-RUN mkdir -p /lauth/apache/libapache2/mod-lauth/usr/lib/apache2/modules
-COPY --from=module /usr/local/include /lauth/apache/libapache2/mod-lauth/usr/include/
+COPY --from=module /usr/local/ /lauth/apache/libapache2/mod-lauth/usr/
 COPY --from=module /usr/lib/apache2/modules/mod_lauth.so /lauth/apache/libapache2/mod-lauth/usr/lib/apache2/modules/
 RUN ./mod-lauth/DEBIAN/package
 
 # Docker Compose Volume Mapping Directory
 COPY ./apache/packages /lauth/apache/packages
 WORKDIR /lauth/apache/libapache2
 
-# debug
-#CMD ["sleep", "infinity"]
-
 FROM debian:bullseye-slim AS bullseye
 RUN apt update; \
     apt install -y --no-install-recommends \
@@ -103,8 +97,7 @@ RUN rm -f /tmp/*.deb
 RUN a2enmod lauth
 RUN a2enmod authn_remoteuser
 
-# debug
-#CMD ["sleep", "infinity"]
+CMD ["apache2ctl", "-D", "FOREGROUND"]
 
 FROM debian:bookworm-slim AS bookworm
 RUN apt update; \
@@ -121,5 +114,4 @@ RUN rm -f /tmp/*.deb
 RUN a2enmod lauth
 RUN a2enmod authn_remoteuser
 
-# debug
-#CMD ["sleep", "infinity"]
+CMD ["apache2ctl", "-D", "FOREGROUND"]

docker-compose.yml

@@ -137,7 +137,6 @@ services:
       interval: "5s"
       timeout: "2s"
       retries: 3
-    command: ["sleep", "infinity"]
 
   bookworm:
     profiles: [ "packages" ]
@@ -156,7 +155,6 @@ services:
       interval: "5s"
       timeout: "2s"
       retries: 3
-    command: ["sleep", "infinity"]
 
   mock-api:
     profiles: [ "test", "integration" ]