benoit/docker-GLPI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction de bug dans glpi_init.sh

Browse Source 
Remplacement de supervisor par runit
Correction de cron qui ne semble pas s'exécuter normalement
This commit is contained in:
root
2020-08-06 10:03:42 +02:00
parent 9cda96d277
commit 815cc5ed55
10 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile
View File

@ -5,11 +5,13 @@ WORKDIR /root
ENV GLPI_CONFIG_DIR=/etc/glpi
ENV GLPI_VAR_DIR=/var/lib/glpi
ENV GLPI_LOG_DIR=/var/log/glpi
ENV GLPI_VERSION=9.5.1
ENV FUSIONINVENTORY_VERSION=9.5.0+1.0
RUN \
apt-get update && \
apt-get install --no-install-recommends -y \
supervisor \
runit \
cron \
libbz2-dev \
libzip-dev \
@ -33,14 +35,12 @@ docker-php-ext-configure opcache && docker-php-ext-install opcache
COPY CAS-1.3.8.tgz /root/
RUN pear install /root/CAS-1.3.8.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 supervisor/ /etc/supervisor/
COPY service/ /etc/service/
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
ADD https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/glpi-${GLPI_VERSION}.tgz /root/glpi-${GLPI_VERSION}.tgz
ADD https://github.com/fusioninventory/fusioninventory-for-glpi/releases/download/glpi${FUSIONINVENTORY_VERSION}/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2 /root/fusioninventory-${FUSIONINVENTORY_VERSION}.tar.bz2
RUN \
chmod a+x /root/glpi_init.sh && \
@ -48,5 +48,5 @@ rm -f /var/www/html/* /root/CAS-1.3.8.tgz && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENTRYPOINT ["supervisord", "--nodaemon", "--configuration", "/etc/supervisor/supervisord.conf"]
#ENTRYPOINT ["supervisord", "--nodaemon", "--configuration", "/etc/supervisor/supervisord.conf"]
ENTRYPOINT ["/usr/bin/runsvdir", "-P", "/etc/service"]