Merge pull request #87 from DiouxX/dev-php8

Update to PHP8.1

Dockerfile

@@ -7,29 +7,29 @@ LABEL org.opencontainers.image.authors="github@diouxx.be"
 #Ne pas poser de question à l'installation
 ENV DEBIAN_FRONTEND noninteractive
 
-#Installation d'apache et de php7.4 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 \ 
+&& 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 \
 apache2 \
-php7.4 \
-php7.4-mysql \
-php7.4-ldap \
-php7.4-xmlrpc \
-php7.4-imap \
-curl \
-php7.4-curl \
-php7.4-gd \
-php7.4-mbstring \
-php7.4-xml \
-php7.4-apcu-bc \
+php8.1 \
+php8.1-mysql \
+php8.1-ldap \
+php8.1-xmlrpc \
+php8.1-imap \
+php8.1-curl \
+php8.1-gd \
+php8.1-mbstring \
+php8.1-xml \
 php-cas \
-php7.4-intl \
-php7.4-zip \
-php7.4-bz2 \
-php7.4-redis \
+php8.1-intl \
+php8.1-zip \
+php8.1-bz2 \
+php8.1-redis \
 cron \
-wget \
-ca-certificates \
 jq \
 libldap-2.4-2 \
 libldap-common \

glpi-start.sh

@@ -34,7 +34,8 @@ else
 fi
 
 #Modification du vhost par défaut
-echo -e "<VirtualHost *:80>\n\tDocumentRoot /var/www/html/glpi\n\n\t<Directory /var/www/html/glpi>\n\t\tAllowOverride All\n\t\tOrder Allow,Deny\n\t\tAllow from all\n\t</Directory>\n\n\tErrorLog /var/log/apache2/error-glpi.log\n\tLogLevel warn\n\tCustomLog /var/log/apache2/access-glpi.log combined\n</VirtualHost>" > /etc/apache2/sites-available/000-default.conf
+set +H
+echo -e "<VirtualHost *:80>\n\tDocumentRoot /var/www/html/glpi/public\n\n\t<Directory /var/www/html/glpi/public>\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</Directory>\n\n\tErrorLog /var/log/apache2/error-glpi.log\n\tLogLevel warn\n\tCustomLog /var/log/apache2/access-glpi.log combined\n</VirtualHost>" > /etc/apache2/sites-available/000-default.conf
 
 #Add scheduled task by cron and enable
 echo "*/2 * * * * www-data /usr/bin/php /var/www/html/glpi/front/cron.php &>/dev/null" >> /etc/cron.d/glpi