From f512854e32f7a4abee64b809ccd5587bd41fa8c4 Mon Sep 17 00:00:00 2001 From: Lepetit Paul Date: Wed, 22 Feb 2017 11:54:41 +0100 Subject: [PATCH] Update Dockerfile 2.3 --- 2.3/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/2.3/Dockerfile b/2.3/Dockerfile index abe7495..a121cb7 100644 --- a/2.3/Dockerfile +++ b/2.3/Dockerfile @@ -87,7 +87,7 @@ RUN bash -c 'mkdir -p /var/lib/ocsinventory-reports/{download,ipd,logs,scripts,s RUN chmod -R +w /var/lib/ocsinventory-reports ;\ chown www-data: -R /var/lib/ocsinventory-reports -ADD dbconfig.inc.php /usr/share/ocsinventory-reports/ocsreports/ +ADD ../dbconfig.inc.php /usr/share/ocsinventory-reports/ocsreports/ RUN cp binutils/ipdiscover-util.pl /usr/share/ocsinventory-reports/ocsreports/ipdiscover-util.pl @@ -97,11 +97,11 @@ RUN chown www-data: /usr/share/ocsinventory-reports/ocsreports/ipdiscover-util.p mkdir -p /var/log/ocsinventory-server/ ;\ chmod +w /var/log/ocsinventory-server/ -ADD /conf/ocsinventory-reports.conf /etc/apache2/conf-available/ -ADD /conf/z-ocsinventory-server.conf /etc/apache2/conf-available/ +ADD ../conf/ocsinventory-reports.conf /etc/apache2/conf-available/ +ADD ../conf/z-ocsinventory-server.conf /etc/apache2/conf-available/ -ADD ./scripts/run.sh /root/run.sh +ADD ../scripts/run.sh /root/run.sh RUN chmod +x /root/run.sh