http-check

apache/Dockerfile

@@ -65,13 +65,19 @@ FROM build-base AS packages
 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/lib/apache2/modules/mod_lauth.so /lauth/apache/libapache2/mod-lauth/usr/lib/apache2/modules/
 RUN ./mod-lauth/DEBIAN/package
 
@@ -88,10 +94,12 @@ RUN apt update; \
         ca-certificates \
         apache2
 
+# install debian packages: http-check, mod-authn-remoteuser, mod-lauth
 COPY --from=packages /lauth/apache/libapache2/*.deb /tmp
 RUN dpkg -i /tmp/*.deb
 RUN rm -f /tmp/*.deb
 
+# enable apache2 modules: lauth, mod-authn-remoteuser
 RUN a2enmod lauth
 RUN a2enmod authn_remoteuser
 
@@ -104,12 +112,14 @@ RUN apt update; \
         ca-certificates \
         apache2
 
+# install debian packages: http-check, mod-authn-remoteuser, mod-lauth
 COPY --from=packages /lauth/apache/libapache2/*.deb /tmp
 RUN dpkg -i /tmp/*.deb
 RUN rm -f /tmp/*.deb
 
+# enable apache2 modules: lauth, mod-authn-remoteuser
 RUN a2enmod lauth
 RUN a2enmod authn_remoteuser
 
 # debug
-CMD ["sleep", "infinity"]
+#CMD ["sleep", "infinity"]

apache/libapache2/http-check/DEBIAN/control

@@ -0,0 +1,8 @@
+Package: http-check
+Version: 0.0.0
+Architecture: arm64
+Essential: no
+Priority: optional
+Depends: apache2
+Maintainer: University of Michigan Library Information Technology
+Description: Health Check for Apache2

apache/libapache2/http-check/DEBIAN/package

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# Build Debian Package
+
+# Script directory
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+# Parse control file to create package directory name
+PACKAGE_DIR=$( cat ${SCRIPT_DIR}/control | awk '$1=="Package:" {print $2} $1=="Version:" {print $2} $1=="Architecture:" {print $2}' | tr '\n' '_' | sed 's/.$//' )
+
+# Build package
+mv http-check ${PACKAGE_DIR}
+dpkg --build ${PACKAGE_DIR}

apache/libapache2/mod-lauth/DEBIAN/postinst

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
 # Post-Installation Script
+ldconfig

docker-compose.yml

@@ -132,11 +132,12 @@ services:
     networks:
       default:
         aliases: ["bullseye"]
-#    healthcheck:
-#      test: ["CMD", "http-check", "http://www.lauth.local"]
-#      interval: "5s"
-#      timeout: "2s"
-#      retries: 3
+    healthcheck:
+      test: ["CMD", "http-check", "http://www.lauth.local"]
+      interval: "5s"
+      timeout: "2s"
+      retries: 3
+    command: ["sleep", "infinity"]
 
   bookworm:
     profiles: [ "packages" ]
@@ -150,11 +151,12 @@ services:
     networks:
       default:
         aliases: ["bookworm"]
-#    healthcheck:
-#      test: ["CMD", "http-check", "http://www.lauth.local"]
-#      interval: "5s"
-#      timeout: "2s"
-#      retries: 3
+    healthcheck:
+      test: ["CMD", "http-check", "http://www.lauth.local"]
+      interval: "5s"
+      timeout: "2s"
+      retries: 3
+    command: ["sleep", "infinity"]
 
   mock-api:
     profiles: [ "test", "integration" ]