diff --git a/Dockerfile b/Dockerfile
index 11406f9..3908112 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,15 @@
-#On choisit une debian
+# On choisit une debian
FROM debian:11.6
LABEL org.opencontainers.image.authors="github@genius.ke"
-
-#Ne pas poser de question à l'installation
+# Ne pas poser de question à l'installation
ENV DEBIAN_FRONTEND noninteractive
-#Installation d'apache et de php8.1 avec extension
+# Installation d'apache et de php8.1 avec extension
RUN apt update \
&& apt install --yes ca-certificates apt-transport-https lsb-release wget curl \
-&& curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg \
+&& curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg \
&& sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' \
&& apt update \
&& apt install --yes --no-install-recommends \
@@ -38,10 +37,84 @@ libsasl2-modules \
libsasl2-modules-db \
&& rm -rf /var/lib/apt/lists/*
-#Copie et execution du script pour l'installation et l'initialisation de GLPI
-COPY glpi-start.sh /opt/
-RUN chmod +x /opt/glpi-start.sh
-ENTRYPOINT ["/opt/glpi-start.sh"]
+# Copie et execution du script pour l'installation et l'initialisation de GLPI
+RUN LOGS="install_glpi.log" \
+&& echo "====================================================" >> $LOGS \
+&& echo "## VARIAVEIS" >> $LOGS \
+&& echo "====================================================" >> $LOGS \
+&& echo "Remove old PHP..." \
+&& yum -y remove \
+ php-cli \
+ mod_php \
+ php-common \
+&& echo "Install ..." \
+&& yum -y install \
+ mod_php \
+ php-cli \
+ php-mysqlnd \
+ php-pear-CAS \
+ wget \
+ php-json \
+ php-mbstring \
+ php-mysqli \
+ php-session \
+ php-gd \
+ php-curl \
+ php-domxml \
+ php-imap \
+ php-ldap \
+ php-openssl \
+ php-opcache \
+ php-apcu \
+ php-xmlrpc \
+ php-intl \
+ php-zip \
+ php-sodium \
+ jq \
+ openssl \
+&& echo "Setting 99-glpi.ini..." \
+&& echo "memory_limit = 64M ;" > /etc/php.d/99-glpi.ini \
+&& echo "file_uploads = on ;" >> /etc/php.d/99-glpi.ini \
+&& echo "max_execution_time = 600 ;" >> /etc/php.d/99-glpi.ini \
+&& echo "register_globals = off ;" >> /etc/php.d/99-glpi.ini \
+&& echo "magic_quotes_sybase = off ;" >> /etc/php.d/99-glpi.ini \
+&& echo "session.auto_start = off ;" >> /etc/php.d/99-glpi.ini \
+&& echo "session.use_trans_sid = 0 ;" >> /etc/php.d/99-glpi.ini \
+&& echo "apc.enable_cli = 1 ;" > /etc/php.d/99-apcu.ini \
+&& FOLDER_GLPI=glpi/ \
+&& FOLDER_WEB=/var/www/html/ \
+&& curl -s https://api.github.com/repos/glpi-project/glpi/releases/latest | grep tag_name | cut -d '"' -f 4 > /tmp/version_glpi \
+&& VERSION_GLPI=$(cat /tmp/version_glpi) \
+&& rm /tmp/version_glpi \
+&& if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset"; else echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/apache2/conf.d/timezone.ini; echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/cli/conf.d/timezone.ini; fi \
+&& sed -i 's,session.cookie_httponly = *\(on\|off\|true\|false\|0\|1\)\?,session.cookie_httponly = on,gi' /etc/php/8.1/apache2/php.ini \
+&& if !(grep -q "TLS_REQCERT" /etc/ldap/ldap.conf); then echo "TLS_REQCERT isn't present"; echo -e "TLS_REQCERT\tnever" >> /etc/ldap/ldap.conf; fi \
+&& if [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI})" ]; then echo "GLPI is already installed"; else SRC_GLPI=$(curl -s https://api.github.com/repos/glpi-project/glpi/releases/tags/${VERSION_GLPI} | jq .assets[0].browser_download_url | tr -d \"); TAR_GLPI=$(basename ${SRC_GLPI}); wget -P ${FOLDER_WEB} ${SRC_GLPI}; tar -xzf ${FOLDER_WEB}${TAR_GLPI} -C ${FOLDER_WEB}; rm -Rf ${FOLDER_WEB}${TAR_GLPI}; chown -R www-data:www-data ${FOLDER_WEB}${FOLDER_GLPI}; fi \
+&& LOCAL_GLPI_VERSION=$(ls ${FOLDER_WEB}/${FOLDER_GLPI}/version) \
+&& LOCAL_GLPI_MAJOR_VERSION=$(echo $LOCAL_GLPI_VERSION | cut -d. -f1) \
+&& LOCAL_GLPI_VERSION_NUM=${LOCAL_GLPI_VERSION//./} \
+&& TARGET_GLPI_VERSION="10.0.14" \
+&& TARGET_GLPI_VERSION_NUM=${TARGET_GLPI_VERSION//./} \
+&& TARGET_GLPI_MAJOR_VERSION=$(echo $TARGET_GLPI_VERSION | cut -d. -f1) \
+&& if [[ $LOCAL_GLPI_VERSION_NUM -lt $TARGET_GLPI_VERSION_NUM || $LOCAL_GLPI_MAJOR_VERSION -lt $TARGET_GLPI_MAJOR_VERSION ]]; then echo -e "\n\tDocumentRoot /var/www/html/glpi\n\n\t\n\t\tAllowOverride All\n\t\tOrder Allow,Deny\n\t\tAllow from all\n\t\n\n\tErrorLog /var/log/apache2/error-glpi.log\n\tLogLevel warn\n\tCustomLog /var/log/apache2/access-glpi.log combined\n" > /etc/apache2/sites-available/000-default.conf; else set +H; echo -e "\n\tDocumentRoot /var/www/html/glpi/public\n\n\t\n\t\tRequire all granted\n\t\tRewriteEngine On\n\t\tRewriteCond %{REQUEST_FILENAME} !-f\n\t\n\t\tRewriteRule ^(.*)$ index.php [QSA,L]\n\t\n\n\tErrorLog /var/log/apache2/error-glpi.log\n\tLogLevel warn\n\tCustomLog /var/log/apache2/access-glpi.log combined\n" > /etc/apache2/sites-available/000-default.conf; fi \
+&& chown -R www-data:www-data /var/www/html/glpi/ \
+&& chmod -R u+rwx /var/www/html/glpi/ \
+&& /usr/bin/php /var/www/html/glpi/bin/console glpi:database:install \
+ --reconfigure \
+ --no-interaction \
+ --force \
+ --db-host=${MARIADB_DB_HOST} \
+ --db-port=${MARIADB_DB_PORT} \
+ --db-name=${MARIADB_DB_NAME} \
+ --db-user=${MARIADB_DB_USER} \
+ --db-password=${MARIADB_DB_PASSWORD} \
+&& /usr/bin/php /var/www/html/glpi/bin/console migration:timestamps \
+&& /usr/bin/php /var/www/html/glpi/bin/console database:enable_timezones \
+&& echo "*/2 * * * * www-data /usr/bin/php /var/www/html/glpi/front/cron.php &>/dev/null" > /etc/cron.d/glpi \
+&& service cron start \
+&& a2enmod rewrite && service apache2 restart && service apache2 stop \
+&& pkill -9 apache \
+&& /usr/sbin/apache2ctl -D FOREGROUND
-#Exposition des ports
+# Exposition des ports
EXPOSE 80 443