Update dev and nightly with @wiltonsr contributions

This commit is contained in:
Charlène Auger 2022-05-03 14:39:04 +02:00
parent 2b6013841c
commit 43b2f79bbd
2 changed files with 6 additions and 8 deletions

View File

@ -51,7 +51,8 @@ RUN apt-get update && apt-get install -y \
git \ git \
vim \ vim \
nano \ nano \
composer composer \
php-ldap
COPY conf/* /tmp/ COPY conf/* /tmp/
COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh

View File

@ -45,7 +45,8 @@ RUN apt-get update && apt-get install -y \
php-curl \ php-curl \
php-xml \ php-xml \
php-zip \ php-zip \
php-gd php-gd \
php-ldap
RUN wget http://download.ocsinventory-ng.org/nightly/latest.tar.gz -P /tmp && \ RUN wget http://download.ocsinventory-ng.org/nightly/latest.tar.gz -P /tmp && \
tar xzf /tmp/latest.tar.gz -C /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 WORKDIR /etc/apache2/conf-available
# Redirect Apache2 Logs to stdout e stderr # Redirect Apache2 Logs to stdout e stderr
# https://github.com/docker-library/httpd/blob/5f92ab18146f41d1d324e99c5e197bdeda65d063/2.4/Dockerfile#L202 RUN ln -sf /proc/self/fd/1 /var/log/apache2/access.log && \
RUN sed -ri \ ln -sf /proc/self/fd/2 /var/log/apache2/error.log
-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"
COPY conf/ /tmp/conf COPY conf/ /tmp/conf
COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh COPY ./scripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh