From 43b2f79bbdf59eb60b5109b7857e9c799571cb1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charl=C3=A8ne=20Auger?= <charlene.auger@factorfx.com>
Date: Tue, 3 May 2022 14:39:04 +0200
Subject: [PATCH] Update dev and nightly with @wiltonsr contributions

---
 dev/Dockerfile     |  3 ++-
 nightly/Dockerfile | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev/Dockerfile b/dev/Dockerfile
index 2942165..4b93b86 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -51,7 +51,8 @@ RUN apt-get update && apt-get install -y \
     git \
     vim \
     nano \
-    composer
+    composer \
+    php-ldap
 
 COPY conf/* /tmp/
 COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
diff --git a/nightly/Dockerfile b/nightly/Dockerfile
index 251c4d1..ec4cdc4 100644
--- a/nightly/Dockerfile
+++ b/nightly/Dockerfile
@@ -45,7 +45,8 @@ RUN apt-get update && apt-get install -y \
     php-curl \
     php-xml \
     php-zip \
-    php-gd 
+    php-gd \
+    php-ldap
 
 RUN wget http://download.ocsinventory-ng.org/nightly/latest.tar.gz -P /tmp && \
     tar xzf /tmp/latest.tar.gz -C /tmp;
@@ -58,12 +59,8 @@ RUN cd /tmp/OCSNG_UNIX_SERVER/Apache/ && \
 WORKDIR /etc/apache2/conf-available
 
 # Redirect Apache2 Logs to stdout e stderr
-# https://github.com/docker-library/httpd/blob/5f92ab18146f41d1d324e99c5e197bdeda65d063/2.4/Dockerfile#L202
-RUN sed -ri \
-      -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-      -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-      -e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \
-      "/etc/apache2/apache2.conf"
+RUN ln -sf /proc/self/fd/1 /var/log/apache2/access.log && \
+    ln -sf /proc/self/fd/2 /var/log/apache2/error.log
 
 COPY conf/ /tmp/conf
 COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh