From 8bc89e97de081dc5b35363c1e8718f61ff9784b2 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 7 Dec 2024 13:17:56 +0200
Subject: [PATCH] LAM: Use the httpd base image.
That's why it's there for.
---
ldap-account-manager/Dockerfile | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/ldap-account-manager/Dockerfile b/ldap-account-manager/Dockerfile
index d08dd55..c9ce7cb 100644
--- a/ldap-account-manager/Dockerfile
+++ b/ldap-account-manager/Dockerfile
@@ -1,36 +1,17 @@
-FROM docker.io/debian:bullseye-slim
+FROM registry.shore.co.il/httpd:bookworm
# hadolint ignore=DL3008
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- ca-certificates \
gettext-base \
ldap-account-manager \
- libcap2-bin \
patch \
- wget \
&& \
- setcap CAP_NET_BIND_SERVICE=+ep /usr/sbin/apache2 && \
- install -d -m 750 -o root -g www-data /var/log/apache2 && \
- install -d -m 755 -o www-data -g root /run/apache2 && \
- a2enmod status && \
- ln -sf /dev/stdout /var/log/apache2/access.log && \
- ln -sf /dev/stderr /var/log/apache2/error.log && \
- ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log && \
rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-ENV APACHE_RUN_DIR=/run/apache2 \
- APACHE_LOG_DIR=/var/log/apache2 \
- APACHE_RUN_USER=www-data \
- APACHE_RUN_GROUP=www-data \
- APACHE_PID_FILE=/run/apache2/apache2.pid
COPY --chown=root:root patch.diff /root/
COPY --chown=root:root entrypoint /usr/local/bin/
COPY --chown=root:root lam-setpass /usr/local/bin/
RUN patch --strip 0 --verbose --directory / --input /root/patch.diff && \
apache2 -t
ENV LDAP_URI=ldapi:///
-EXPOSE 80
-USER "www-data"
-WORKDIR /var/www
ENTRYPOINT [ "entrypoint" ]
-CMD [ "apache2", "-DFOREGROUND" ]
HEALTHCHECK CMD wget --spider --quiet http://localhost/lam/ --user-agent 'Healthcheck' || exit 1
--
GitLab