mirror of
https://github.com/DiouxX/docker-glpi.git
synced 2026-11-07 15:32:33 -05:00
Compare commits
14
Commits
b97b32ebe1
..
php7.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d4d1a0d1b | ||
|
|
f5fd511cfa | ||
|
|
c1171a1847 | ||
|
|
4dff6e4ae5 | ||
|
|
7fb771082c | ||
|
|
c67bc0b317 | ||
|
|
f8ceba3d73 | ||
|
|
f0342a357f | ||
|
|
6da5988ef3 | ||
|
|
7f7075bf06 | ||
|
|
fb5f49768c | ||
|
|
3f9a84e253 | ||
|
|
a91721b753 | ||
|
|
58ff53e00b |
No files matched your search
@@ -1,9 +1,10 @@
|
|||||||
name: Build & Publish Docker Image
|
name: Build & Publish Docker Image PHP 7.4
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- php7.4
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
docker:
|
docker:
|
||||||
@@ -24,4 +25,4 @@ jobs:
|
|||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: diouxx/glpi:latest
|
tags: diouxx/glpi:php7.4
|
||||||
+16
-16
@@ -1,5 +1,5 @@
|
|||||||
#On choisit une debian
|
#On choisit une debian
|
||||||
FROM debian:11.6
|
FROM debian:12.5
|
||||||
|
|
||||||
LABEL org.opencontainers.image.authors="github@diouxx.be"
|
LABEL org.opencontainers.image.authors="github@diouxx.be"
|
||||||
|
|
||||||
@@ -7,7 +7,7 @@ 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 php8.1 avec extension
|
#Installation d'apache et de php7.4 avec extension
|
||||||
RUN apt update \
|
RUN apt update \
|
||||||
&& apt install --yes ca-certificates apt-transport-https lsb-release wget curl \
|
&& 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 \
|
||||||
@@ -15,23 +15,23 @@ RUN apt update \
|
|||||||
&& apt update \
|
&& apt update \
|
||||||
&& apt install --yes --no-install-recommends \
|
&& apt install --yes --no-install-recommends \
|
||||||
apache2 \
|
apache2 \
|
||||||
php8.1 \
|
php7.4 \
|
||||||
php8.1-mysql \
|
php7.4-mysql \
|
||||||
php8.1-ldap \
|
php7.4-ldap \
|
||||||
php8.1-xmlrpc \
|
php7.4-xmlrpc \
|
||||||
php8.1-imap \
|
php7.4-imap \
|
||||||
php8.1-curl \
|
php7.4-curl \
|
||||||
php8.1-gd \
|
php7.4-gd \
|
||||||
php8.1-mbstring \
|
php7.4-mbstring \
|
||||||
php8.1-xml \
|
php7.4-xml \
|
||||||
php-cas \
|
php-cas \
|
||||||
php8.1-intl \
|
php7.4-intl \
|
||||||
php8.1-zip \
|
php7.4-zip \
|
||||||
php8.1-bz2 \
|
php7.4-bz2 \
|
||||||
php8.1-redis \
|
php7.4-redis \
|
||||||
cron \
|
cron \
|
||||||
jq \
|
jq \
|
||||||
libldap-2.4-2 \
|
libldap-2.5-0 \
|
||||||
libldap-common \
|
libldap-common \
|
||||||
libsasl2-2 \
|
libsasl2-2 \
|
||||||
libsasl2-modules \
|
libsasl2-modules \
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
# Starter pipeline
|
|
||||||
# Start with a minimal pipeline that you can customize to build and deploy your code.
|
|
||||||
# Add steps that build, run tests, deploy, and more:
|
|
||||||
# https://aka.ms/yaml
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
- master
|
|
||||||
|
|
||||||
pool:
|
|
||||||
vmImage: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- task: WhiteSource@21
|
|
||||||
inputs:
|
|
||||||
cwd: '$(System.DefaultWorkingDirectory)'
|
|
||||||
+4
-4
@@ -6,12 +6,12 @@
|
|||||||
|
|
||||||
if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset";
|
if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset";
|
||||||
else
|
else
|
||||||
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/apache2/conf.d/timezone.ini;
|
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.4/apache2/conf.d/timezone.ini;
|
||||||
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/cli/conf.d/timezone.ini;
|
echo "date.timezone = \"$TIMEZONE\"" > /etc/php/7.4/cli/conf.d/timezone.ini;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Enable session.cookie_httponly
|
#Enable session.cookie_httponly
|
||||||
sed -i 's,session.cookie_httponly = *\(on\|off\|true\|false\|0\|1\)\?,session.cookie_httponly = on,gi' /etc/php/8.1/apache2/php.ini
|
sed -i 's,session.cookie_httponly = *\(on\|off\|true\|false\|0\|1\)\?,session.cookie_httponly = on,gi' /etc/php/7.4/apache2/php.ini
|
||||||
|
|
||||||
FOLDER_GLPI=glpi/
|
FOLDER_GLPI=glpi/
|
||||||
FOLDER_WEB=/var/www/html/
|
FOLDER_WEB=/var/www/html/
|
||||||
@@ -24,7 +24,7 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
#Téléchargement et extraction des sources de GLPI
|
#Téléchargement et extraction des sources de GLPI
|
||||||
if [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI})" ];
|
if [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI}/bin)" ];
|
||||||
then
|
then
|
||||||
echo "GLPI is already installed"
|
echo "GLPI is already installed"
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in new issue
Block a user