Skip to content

Commit

Permalink
rename libapache2 to debpkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
gkostin1966 committed Apr 24, 2024
1 parent d13d17e commit 636174c
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,25 @@ COPY ./apache/conf/* /usr/local/apache2/conf/
###
FROM build-base AS packages

COPY ./apache/libapache2 /lauth/apache/libapache2
WORKDIR /lauth/apache/libapache2
COPY ./apache/debpkgs /lauth/apache/debpkgs
WORKDIR /lauth/apache/debpkgs

# http-check
COPY --from=module /lauth/apache/build/http-check /lauth/apache/libapache2/http-check/usr/bin/
COPY --from=module /lauth/apache/build/http-check /lauth/apache/debpkgs/http-check/usr/bin/
RUN ./http-check/DEBIAN/package

# mod-authn-remoteuser
COPY --from=module /usr/lib/apache2/modules/mod_authn_remoteuser.so /lauth/apache/libapache2/mod-authn-remoteuser/usr/lib/apache2/modules/
COPY --from=module /usr/lib/apache2/modules/mod_authn_remoteuser.so /lauth/apache/debpkgs/mod-authn-remoteuser/usr/lib/apache2/modules/
RUN ./mod-authn-remoteuser/DEBIAN/package

# mod-lauth
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/
COPY --from=module /usr/local/ /lauth/apache/debpkgs/mod-lauth/usr/
COPY --from=module /usr/lib/apache2/modules/mod_lauth.so /lauth/apache/debpkgs/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
WORKDIR /lauth/apache/debpkgs

##
FROM debian:bullseye-slim AS bullseye
Expand All @@ -93,7 +93,7 @@ RUN apt update; \
RUN a2enmod authz_groupfile cgid headers proxy proxy_http remoteip rewrite

# install debian packages: http-check, mod-authn-remoteuser, mod-lauth
COPY --from=packages /lauth/apache/libapache2/*.deb /tmp
COPY --from=packages /lauth/apache/debpkgs/*.deb /tmp
RUN dpkg -i /tmp/*.deb
RUN rm -f /tmp/*.deb

Expand Down Expand Up @@ -124,7 +124,7 @@ RUN apt update; \
apache2

# install debian packages: http-check, mod-authn-remoteuser, mod-lauth
COPY --from=packages /lauth/apache/libapache2/*.deb /tmp
COPY --from=packages /lauth/apache/debpkgs/*.deb /tmp
RUN dpkg -i /tmp/*.deb
RUN rm -f /tmp/*.deb

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 636174c

Please sign in to comment.