Fix Github Actions

Fix: Installation does not happen when glpi volume is provided by a persistent volume on kubernetes

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

@@ -1,9 +1,10 @@
-name: Build & Publish Docker Image
+name: Build & Publish Docker Image PHP 7.4
 
 on:
   push:
     branches:
-      - master
+      - php7.4
+  workflow_dispatch:
 
 jobs:
   docker:
@@ -24,4 +25,4 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: diouxx/glpi:latest
+          tags: diouxx/glpi:php7.4

.gitignore

@@ -1 +1,4 @@
 docker-compose-test.yml
+cust-entry.sh
+data
+start-docker.sh

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"
 
@@ -9,6 +9,10 @@ ENV DEBIAN_FRONTEND noninteractive
 
 #Installation d'apache et de php7.4 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 \
@@ -16,22 +20,18 @@ 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 \
 php-cas \
 php7.4-intl \
 php7.4-zip \
 php7.4-bz2 \
 php7.4-redis \
 cron \
-wget \
-ca-certificates \
 jq \
-libldap-2.4-2 \
+libldap-2.5-0 \
 libldap-common \
 libsasl2-2 \
 libsasl2-modules \

glpi-start.sh

@@ -10,8 +10,9 @@ 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;
 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 \")
+#Enable session.cookie_httponly
-TAR_GLPI=$(basename ${SRC_GLPI})
+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_WEB=/var/www/html/
 
@@ -23,10 +24,13 @@ 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
+	SRC_GLPI=$(curl -s https://api.github.com/repos/glpi-project/glpi/releases/tags/${VERSION_GLPI} | jq .assets[0].browser_download_url | tr -d \")
+	TAR_GLPI=$(basename ${SRC_GLPI})
+
 	wget -P ${FOLDER_WEB} ${SRC_GLPI}
 	tar -xzf ${FOLDER_WEB}${TAR_GLPI} -C ${FOLDER_WEB}
 	rm -Rf ${FOLDER_WEB}${TAR_GLPI}
@@ -55,12 +59,15 @@ else
 fi
 
 #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
 service cron start
 
 #Activation du module rewrite d'apache
 a2enmod rewrite && service apache2 restart && service apache2 stop
 
+#Fix to really stop apache
+pkill -9 apache
+
 #Lancement du service apache au premier plan
 /usr/sbin/apache2ctl -D FOREGROUND