From 5073a9efa2221e29dff5ffce0ef296f8270ab1a7 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Aug 2020 00:35:38 +0200 Subject: [PATCH] Correction ADD par COPY --- Dockerfile | 16 ++++++++-------- glpi_init.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index a064e44..0576862 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,15 +27,15 @@ docker-php-ext-configure zip && docker-php-ext-install zip && \ docker-php-ext-configure bz2 && docker-php-ext-install bz2 && \ docker-php-ext-configure opcache && docker-php-ext-install opcache -ADD CAS-1.3.8.tgz /root +COPY CAS-1.3.8.tgz /root/ RUN pear install /root/CAS-1.3.8.tgz -ADD supervisor/supervisord.conf /etc/supervisor -ADD supervisor/conf.d/apache2.conf /etc/supervisor/conf.d -ADD supervisor/conf.d/cron.conf /etc/supervisor/conf.d -ADD supervisor/conf.d/glpi_init.conf /etc/supervisor/conf.d -ADD glpi_init.sh /root/glpi_init.sh -ADD glpi.cron /etc/cron.d/glpi -ADD https://github.com/glpi-project/glpi/releases/download/9.5.0/glpi-9.5.0.tgz /root/glpi-9.5.0.tgz +COPY supervisor/supervisord.conf /etc/supervisor/ +COPY supervisor/conf.d/apache2.conf /etc/supervisor/conf.d/ +COPY supervisor/conf.d/cron.conf /etc/supervisor/conf.d/ +COPY supervisor/conf.d/glpi_init.conf /etc/supervisor/conf.d/ +COPY glpi_init.sh /root/glpi_init.sh +COPY glpi.cron /etc/cron.d/glpi +ADD https://github.com/glpi-project/glpi/releases/download/9.5.1/glpi-9.5.1.tgz /root/glpi-9.5.1.tgz ADD https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi9.5.0%2B1.0/fusioninventory-9.5.0+1.0.tar.bz2 /root/fusioninventory-9.5.0+1.0.tar.bz2 RUN \ diff --git a/glpi_init.sh b/glpi_init.sh index e1d8e88..11a17d9 100644 --- a/glpi_init.sh +++ b/glpi_init.sh @@ -1,5 +1,5 @@ #!/bin/sh -GLPI_TARBALL="/root/glpi-9.5.0.tgz" +GLPI_TARBALL="/root/glpi-9.5.1.tgz" FUSION_TARBALL="/root/fusioninventory-9.5.0+1.0.tar.bz2" if [ -z $(ls -A /var/www/html) ] ; then