Correction ADD par COPY

This commit is contained in:
root 2020-08-04 00:35:38 +02:00
parent e7ec47a6fa
commit 5073a9efa2
2 changed files with 9 additions and 9 deletions

View File

@ -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 bz2 && docker-php-ext-install bz2 && \
docker-php-ext-configure opcache && docker-php-ext-install opcache 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 RUN pear install /root/CAS-1.3.8.tgz
ADD supervisor/supervisord.conf /etc/supervisor COPY supervisor/supervisord.conf /etc/supervisor/
ADD supervisor/conf.d/apache2.conf /etc/supervisor/conf.d COPY supervisor/conf.d/apache2.conf /etc/supervisor/conf.d/
ADD supervisor/conf.d/cron.conf /etc/supervisor/conf.d COPY supervisor/conf.d/cron.conf /etc/supervisor/conf.d/
ADD supervisor/conf.d/glpi_init.conf /etc/supervisor/conf.d COPY supervisor/conf.d/glpi_init.conf /etc/supervisor/conf.d/
ADD glpi_init.sh /root/glpi_init.sh COPY glpi_init.sh /root/glpi_init.sh
ADD glpi.cron /etc/cron.d/glpi COPY 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 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 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 \ RUN \

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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" FUSION_TARBALL="/root/fusioninventory-9.5.0+1.0.tar.bz2"
if [ -z $(ls -A /var/www/html) ] ; then if [ -z $(ls -A /var/www/html) ] ; then