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
DiouxX a0382c3c17 Merge pull request #86 from p1ne/master
Make apache config compatible with 10.0.7
2023-04-27 09:06:34 +02:00
p1ne 5e45330a44 Make apache config compatible with 10.0.7
See https://glpi-install.readthedocs.io/en/develop/prerequisites.html#apache-configuration for updated apache format
2023-04-25 17:12:02 +03:00
DiouxX 29142fb886 Add Github actions to Build and Push 2023-02-24 18:12:54 +01:00
DiouxX 6fa1854e7d Update components 2023-01-22 10:54:46 +01:00
DiouxX 9f3a81bbd9 Merge pull request #77 from paspo/redis
added redis package
2022-11-10 14:57:29 +01:00
Paolo Asperti ecf3657deb added redis package 2022-11-09 10:30:48 +01:00
DiouxX 845cc6516a Add mariadb.env 2022-04-08 16:17:59 +02:00
DiouxX 426fe39720 Replace mysql.env by mariadb.env 2022-04-08 16:17:06 +02:00
DiouxX e1cc6bcac5 Merge pull request #55 from DiouxX/revert-51-master
Revert "Extend the GLPI installed check"
2022-03-07 15:30:18 +01:00
5 changed files with 54 additions and 25 deletions

No files matched your search

+27
View File
@@ -0,0 +1,27 @@
name: Build & Publish Docker Image
on:
push:
branches:
- master
jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Set output
id: vars
run: echo ::set-output name=tag::$
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
push: true
tags: diouxx/glpi:latest
+19 -18
View File
@@ -1,5 +1,5 @@
#On choisit une debian
FROM debian:11.1
FROM debian:11.6
LABEL org.opencontainers.image.authors="github@diouxx.be"
@@ -7,28 +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 \
php8.1-intl \
php8.1-zip \
php8.1-bz2 \
php8.1-redis \
cron \
wget \
ca-certificates \
jq \
libldap-2.4-2 \
libldap-common \
+4 -3
View File
@@ -6,8 +6,8 @@
if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset";
else
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.4/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/apache2/conf.d/timezone.ini;
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/cli/conf.d/timezone.ini;
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 \")
@@ -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
+4
View File
@@ -0,0 +1,4 @@
MARIADB_ROOT_PASSWORD=diouxx
MARIADB_DATABASE=glpidb
MARIADB_USER=glpi_user
MARIADB_PASSWORD=glpi
-4
View File
@@ -1,4 +0,0 @@
MYSQL_ROOT_PASSWORD=diouxx
MYSQL_DATABASE=glpidb
MYSQL_USER=glpi_user
MYSQL_PASSWORD=glpi