Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
gkostin1966 committed Apr 22, 2024
1 parent 561fe4c commit 1121ada
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
14 changes: 1 addition & 13 deletions apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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"]
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ services:
interval: "5s"
timeout: "2s"
retries: 3
command: ["sleep", "infinity"]

bookworm:
profiles: [ "packages" ]
Expand All @@ -156,7 +155,6 @@ services:
interval: "5s"
timeout: "2s"
retries: 3
command: ["sleep", "infinity"]

mock-api:
profiles: [ "test", "integration" ]
Expand Down

0 comments on commit 1121ada

Please sign in to comment.