From 1121ada440671e60872995af653cd1b0170787f2 Mon Sep 17 00:00:00 2001
From: Greg Kostin <gkostin@umich.edu>
Date: Mon, 22 Apr 2024 11:21:44 -0400
Subject: [PATCH] cleanup

---
 apache/Dockerfile  | 14 +-------------
 docker-compose.yml |  2 --
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 6ba837c..7c82cb6 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -66,18 +66,15 @@ 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
 
@@ -85,9 +82,6 @@ RUN ./mod-lauth/DEBIAN/package
 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,9 +97,6 @@ RUN rm -f /tmp/*.deb
 RUN a2enmod lauth
 RUN a2enmod authn_remoteuser
 
-# debug
-#CMD ["sleep", "infinity"]
-
 FROM debian:bookworm-slim AS bookworm
 RUN apt update; \
     apt install -y --no-install-recommends \
@@ -120,6 +111,3 @@ RUN rm -f /tmp/*.deb
 # enable apache2 modules: lauth, mod-authn-remoteuser
 RUN a2enmod lauth
 RUN a2enmod authn_remoteuser
-
-# debug
-#CMD ["sleep", "infinity"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 302f3d8..a93f778 100644
--- a/docker-compose.yml
+++ b/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" ]