Add Docker build and push to dev branch

Debian12

.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.yml

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

.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.1
+FROM debian:12.5
 
 LABEL org.opencontainers.image.authors="github@diouxx.be"
 
@@ -7,30 +7,31 @@ 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.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 \ 
+&& 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 \
+php8.3 \
-php7.4-mysql \
+php8.3-mysql \
-php7.4-ldap \
+php8.3-ldap \
-php7.4-xmlrpc \
+php8.3-xmlrpc \
-php7.4-imap \
+php8.3-imap \
-curl \
+php8.3-curl \
-php7.4-curl \
+php8.3-gd \
-php7.4-gd \
+php8.3-mbstring \
-php7.4-mbstring \
+php8.3-xml \
-php7.4-xml \
-php7.4-apcu-bc \
 php-cas \
-php7.4-intl \
+php8.3-intl \
-php7.4-zip \
+php8.3-zip \
-php7.4-bz2 \
+php8.3-bz2 \
+php8.3-redis \
 cron \
-wget \
-ca-certificates \
 jq \
-libldap-2.4-2 \
+libldap-2.5-0 \
 libldap-common \
 libsasl2-2 \
 libsasl2-modules \

glpi-start.sh

@@ -6,12 +6,13 @@
 
 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/8.3/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.3/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/8.3/apache2/php.ini
+
 FOLDER_GLPI=glpi/
 FOLDER_WEB=/var/www/html/
 
@@ -27,22 +28,46 @@ if [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI})" ];
 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}
 	chown -R www-data:www-data ${FOLDER_WEB}${FOLDER_GLPI}
 fi
 
-#Modification du vhost par défaut
+#Adapt the Apache server according to the version of GLPI installed
-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
+## Extract local version installed
+LOCAL_GLPI_VERSION=$(ls ${FOLDER_WEB}/${FOLDER_GLPI}/version)
+## Extract major version number
+LOCAL_GLPI_MAJOR_VERSION=$(echo $LOCAL_GLPI_VERSION | cut -d. -f1)
+## Remove dots from version string
+LOCAL_GLPI_VERSION_NUM=${LOCAL_GLPI_VERSION//./}
+
+## Target value is GLPI 1.0.7
+TARGET_GLPI_VERSION="10.0.7"
+TARGET_GLPI_VERSION_NUM=${TARGET_GLPI_VERSION//./}
+TARGET_GLPI_MAJOR_VERSION=$(echo $TARGET_GLPI_VERSION | cut -d. -f1)
+
+# Compare the numeric value of the version number to the target number
+if [[ $LOCAL_GLPI_VERSION_NUM -lt $TARGET_GLPI_VERSION_NUM || $LOCAL_GLPI_MAJOR_VERSION -lt $TARGET_GLPI_MAJOR_VERSION ]]; then
+  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
+else
+  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
+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

mariadb.env

@@ -0,0 +1,4 @@
+MARIADB_ROOT_PASSWORD=diouxx
+MARIADB_DATABASE=glpidb
+MARIADB_USER=glpi_user
+MARIADB_PASSWORD=glpi

mysql.env

@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=diouxx
-MYSQL_DATABASE=glpidb
-MYSQL_USER=glpi_user
-MYSQL_PASSWORD=glpi