diff --git a/apache/Dockerfile b/apache/Dockerfile index dcdcadf..4d14256 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -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 @@ -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 @@ -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 diff --git a/apache/libapache2/http-check/DEBIAN/control b/apache/debpkgs/http-check/DEBIAN/control similarity index 100% rename from apache/libapache2/http-check/DEBIAN/control rename to apache/debpkgs/http-check/DEBIAN/control diff --git a/apache/libapache2/http-check/DEBIAN/package b/apache/debpkgs/http-check/DEBIAN/package similarity index 100% rename from apache/libapache2/http-check/DEBIAN/package rename to apache/debpkgs/http-check/DEBIAN/package diff --git a/apache/libapache2/mod-authn-remoteuser/DEBIAN/control b/apache/debpkgs/mod-authn-remoteuser/DEBIAN/control similarity index 100% rename from apache/libapache2/mod-authn-remoteuser/DEBIAN/control rename to apache/debpkgs/mod-authn-remoteuser/DEBIAN/control diff --git a/apache/libapache2/mod-authn-remoteuser/DEBIAN/package b/apache/debpkgs/mod-authn-remoteuser/DEBIAN/package similarity index 100% rename from apache/libapache2/mod-authn-remoteuser/DEBIAN/package rename to apache/debpkgs/mod-authn-remoteuser/DEBIAN/package diff --git a/apache/libapache2/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.conf b/apache/debpkgs/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.conf similarity index 100% rename from apache/libapache2/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.conf rename to apache/debpkgs/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.conf diff --git a/apache/libapache2/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.load b/apache/debpkgs/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.load similarity index 100% rename from apache/libapache2/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.load rename to apache/debpkgs/mod-authn-remoteuser/etc/apache2/mods-available/authn_remoteuser.load diff --git a/apache/libapache2/mod-lauth/DEBIAN/control b/apache/debpkgs/mod-lauth/DEBIAN/control similarity index 100% rename from apache/libapache2/mod-lauth/DEBIAN/control rename to apache/debpkgs/mod-lauth/DEBIAN/control diff --git a/apache/libapache2/mod-lauth/DEBIAN/package b/apache/debpkgs/mod-lauth/DEBIAN/package similarity index 100% rename from apache/libapache2/mod-lauth/DEBIAN/package rename to apache/debpkgs/mod-lauth/DEBIAN/package diff --git a/apache/libapache2/mod-lauth/DEBIAN/postinst b/apache/debpkgs/mod-lauth/DEBIAN/postinst similarity index 100% rename from apache/libapache2/mod-lauth/DEBIAN/postinst rename to apache/debpkgs/mod-lauth/DEBIAN/postinst diff --git a/apache/libapache2/mod-lauth/etc/apache2/mods-available/lauth.load b/apache/debpkgs/mod-lauth/etc/apache2/mods-available/lauth.load similarity index 100% rename from apache/libapache2/mod-lauth/etc/apache2/mods-available/lauth.load rename to apache/debpkgs/mod-lauth/etc/apache2/mods-available/lauth.load