Merge pull request #124 from BossMBGaming/BossMBGaming-patch-1

Update Dockerfile and add php-bcmath

.github/workflows/docker-dev.yml

@@ -0,0 +1,23 @@
+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

.github/workflows/docker-php7.4.yml

@@ -0,0 +1,28 @@
+name: Build & Publish Docker Image PHP 7.4
+
+on:
+  push:
+    branches:
+      - php7.4
+  workflow_dispatch:
+
+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:php7.4

Dockerfile

@@ -1,5 +1,5 @@
 #On choisit une debian
-FROM debian:11.6
+FROM debian:12.5
 
 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
 ENV DEBIAN_FRONTEND noninteractive
 
-#Installation d'apache et de php8.1 avec extension
+#Installation d'apache et de php8.3 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 \ 
@@ -15,23 +15,24 @@ RUN apt update \
 && apt update \
 && apt install --yes --no-install-recommends \
 apache2 \
-php8.1 \
+php8.3 \
-php8.1-mysql \
+php8.3-mysql \
-php8.1-ldap \
+php8.3-bcmath \
-php8.1-xmlrpc \
+php8.3-ldap \
-php8.1-imap \
+php8.3-xmlrpc \
-php8.1-curl \
+php8.3-imap \
-php8.1-gd \
+php8.3-curl \
-php8.1-mbstring \
+php8.3-gd \
-php8.1-xml \
+php8.3-mbstring \
+php8.3-xml \
 php-cas \
-php8.1-intl \
+php8.3-intl \
-php8.1-zip \
+php8.3-zip \
-php8.1-bz2 \
+php8.3-bz2 \
-php8.1-redis \
+php8.3-redis \
 cron \
 jq \
-libldap-2.4-2 \
+libldap-2.5-0 \
 libldap-common \
 libsasl2-2 \
 libsasl2-modules \

azure-pipelines.yml

@@ -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)'

glpi-start.sh

@@ -6,12 +6,12 @@
 
 if [[ -z "${TIMEZONE}" ]]; then echo "TIMEZONE is unset"; 
 else 
-echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/apache2/conf.d/timezone.ini;
+echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.3/apache2/conf.d/timezone.ini;
-echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.1/cli/conf.d/timezone.ini;
+echo "date.timezone = \"$TIMEZONE\"" > /etc/php/8.3/cli/conf.d/timezone.ini;
 fi
 
 #Enable session.cookie_httponly
-sed -i 's,session.cookie_httponly =,session.cookie_httponly = on,g' /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/8.3/apache2/php.ini
 
 FOLDER_GLPI=glpi/
 FOLDER_WEB=/var/www/html/
@@ -24,7 +24,7 @@ then
 fi
 
 #Téléchargement et extraction des sources de GLPI
-if [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI})" ];
+if [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI}/bin)" ];
 then
 	echo "GLPI is already installed"
 else