Author SHA1 Message Date
DiouxX 69940f5ec1 Fix issue after update to php 8 2023-04-27 17:28:11 +02:00
DiouxX 37c78566b4 Merge pull request #87 from DiouxX/dev-php8
Update to PHP8.1
2023-04-27 10:09:22 +02:00
DiouxX 9f39374d7e Update to PHP8.1 2023-04-27 10:03:55 +02:00
2 changed files with 23 additions and 40 deletions

No files matched your search

+18 -18
View File
@@ -7,29 +7,29 @@ LABEL org.opencontainers.image.authors="github@diouxx.be"
#Ne pas poser de question à l'installation #Ne pas poser de question à l'installation
ENV DEBIAN_FRONTEND noninteractive 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 \ 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 \ && apt install --yes --no-install-recommends \
apache2 \ apache2 \
php7.4 \ php8.1 \
php7.4-mysql \ php8.1-mysql \
php7.4-ldap \ php8.1-ldap \
php7.4-xmlrpc \ php8.1-xmlrpc \
php7.4-imap \ php8.1-imap \
curl \ php8.1-curl \
php7.4-curl \ php8.1-gd \
php7.4-gd \ php8.1-mbstring \
php7.4-mbstring \ php8.1-xml \
php7.4-xml \
php7.4-apcu-bc \
php-cas \ php-cas \
php7.4-intl \ php8.1-intl \
php7.4-zip \ php8.1-zip \
php7.4-bz2 \ php8.1-bz2 \
php7.4-redis \ php8.1-redis \
cron \ cron \
wget \
ca-certificates \
jq \ jq \
libldap-2.4-2 \ libldap-2.4-2 \
libldap-common \ libldap-common \
+5 -22
View File
@@ -6,8 +6,8 @@
if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset"; if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset";
else else
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.4/apache2/conf.d/timezone.ini; echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/apache2/conf.d/timezone.ini;
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.4/cli/conf.d/timezone.ini; echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/cli/conf.d/timezone.ini;
fi fi
SRC_GLPI=$(curl -s https://api.github.com/repos/glpi-project/glpi/releases/tags/${VERSION_GLPI} | jq .assets[0].browser_download_url | tr -d \") SRC_GLPI=$(curl -s https://api.github.com/repos/glpi-project/glpi/releases/tags/${VERSION_GLPI} | jq .assets[0].browser_download_url | tr -d \")
@@ -33,26 +33,9 @@ else
chown -R www-data:www-data ${FOLDER_WEB}${FOLDER_GLPI} chown -R www-data:www-data ${FOLDER_WEB}${FOLDER_GLPI}
fi fi
#Adapt the Apache server according to the version of GLPI installed #Modification du vhost par défaut
## Extract local version installed set +H
LOCAL_GLPI_VERSION=$(ls ${FOLDER_WEB}/${FOLDER_GLPI}/version) 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
## Extract major version number
LOCAL_GLPI_MAJOR_VERSION=$(echo $LOCAL_GLPI_VERSION | cut -d. -f1)
## Remove dots from version string
LOCAL_GLPI_VERSION_NUM=${LOCAL_GLPI_VERSION//./}
## Target value is GLPI 1.0.7
TARGET_GLPI_VERSION="10.0.7"
TARGET_GLPI_VERSION_NUM=${TARGET_GLPI_VERSION//./}
TARGET_GLPI_MAJOR_VERSION=$(echo $TARGET_GLPI_VERSION | cut -d. -f1)
# Compare the numeric value of the version number to the target number
if [[ $LOCAL_GLPI_VERSION_NUM -lt $TARGET_GLPI_VERSION_NUM || $LOCAL_GLPI_MAJOR_VERSION -lt $TARGET_GLPI_MAJOR_VERSION ]]; then
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
else
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
fi
#Add scheduled task by cron and enable #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 echo "*/2 * * * * www-data /usr/bin/php /var/www/html/glpi/front/cron.php &>/dev/null" >> /etc/cron.d/glpi