11 Commits
Author SHA1 Message Date
DiouxX 4d4d1a0d1b Fix Github Actions 2024-06-14 15:26:46 +02:00
DiouxX f5fd511cfa Add Github Actions 2024-06-14 15:25:33 +02:00
DiouxX c1171a1847 Change to PHP 7.4 2024-06-14 15:15:06 +02:00
DiouxX 4dff6e4ae5 Merge pull request #116 from marvinpac-it/check-bin-dir
Fix: Installation does not happen when glpi volume is provided by a persistent volume on kubernetes
2024-04-07 20:29:17 +02:00
Olivier Boudry 7fb771082c Make install happen when using persistent volumes 2024-04-02 13:16:12 +00:00
DiouxX c67bc0b317 Merge pull request #113 from DiouxX/dev
Update to debian 12
2024-03-26 19:52:46 +01:00
DiouxX f8ceba3d73 Add Docker build and push to dev branch 2024-03-22 13:38:30 +01:00
DiouxX fb5f49768c Merge pull request #111 from DiouxX/debian12
Debian12
2024-03-22 12:02:44 +01:00
DiouxX 3f9a84e253 Merge branch 'dev' into debian12 2024-03-22 11:56:42 +01:00
DiouxX a91721b753 Upgrade to Debian 12 2024-03-22 11:46:13 +01:00
DiouxX 58ff53e00b Add SNMP package 2018-12-28 10:19:45 +01:00
5 changed files with 24 additions and 61 deletions

No files matched your search

-23
View File
@@ -1,23 +0,0 @@
name: Build & Publish Dev Docker image
on:
push:
branches:
- "dev"
workflow_dispatch:
jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v5.3.0
with:
push: true
tags: diouxx/glpi:dev
@@ -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
View File
@@ -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 \
-15
View File
@@ -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
View File
@@ -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