adminbruno/docker-glpi
1
0 Fork 0
mirror of https://github.com/DiouxX/docker-glpi.git synced 2026-11-14 16:52:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: adminbruno/docker-glpi:issue-apache
adminbruno/docker-glpi:master adminbruno/docker-glpi:php7.4 adminbruno/docker-glpi:dev adminbruno/docker-glpi:issue-apache adminbruno/docker-glpi:revert-51-master adminbruno/docker-glpi:9.1.4 adminbruno/docker-glpi:9.1.3 adminbruno/docker-glpi:9.1.2 adminbruno/docker-glpi:9.1 adminbruno/docker-glpi:0.90.5
...
compare: adminbruno/docker-glpi:65446fd9fed8792641e3305177aca4099bf04561
adminbruno/docker-glpi:master adminbruno/docker-glpi:php7.4 adminbruno/docker-glpi:dev adminbruno/docker-glpi:issue-apache adminbruno/docker-glpi:revert-51-master adminbruno/docker-glpi:9.1.4 adminbruno/docker-glpi:9.1.3 adminbruno/docker-glpi:9.1.2 adminbruno/docker-glpi:9.1 adminbruno/docker-glpi:0.90.5
6 Commits
issue-apache ... 65446fd9fe
Author SHA1 Message Date
DiouxX 65446fd9fe Merge pull request #96 from vladkvl13/patch-1 
Update glpi-start.sh
 2023-10-22 19:57:43 +02:00
vladkvl13 1051a4f1cf Update glpi-start.sh 
When the container starts, this command append the line every time. After 13 months of daily container restarts (because of bareos backup), whe have /etc/cron.d/glpi with more than 500+ line of similar crons. This make a critical CPU utilize on server. After changes all works fine.
 2023-07-20 08:31:31 +03:00
DiouxX e4d30f8337 Merge pull request #91 from DiouxX/issue-apache 
Fix issue vhost apache regarding GLPI version
 2023-04-28 11:43:45 +02:00
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 21 additions and 21 deletions
Expand all files Collapse all files

No files matched your search

Dockerfile
+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 \
glpi-start.sh
+3 -3
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 \")
@@ -55,7 +55,7 @@ else
fi 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
#Start cron service #Start cron service
service cron start service cron start