Merge pull request #12 from geniusdynamics/dev

Merge Dev into main
geniusdynamics · Jun 3, 2024 · 21e7389 · 21e7389
2 parents df9b5a2 + eaef121
commit 21e7389
Show file tree

Hide file tree

Showing 3 changed files with 509 additions and 509 deletions.
diff --git a/build-images.sh b/build-images.sh
@@ -14,7 +14,7 @@ images=()
 repobase="${REPOBASE:-ghcr.io/geniusdynamics}"
 # Configure the image name
 reponame="glpi"
-app_version="10.0.14"
+app_version="10.0.15"
 # Create a new empty container image
 container=$(buildah from scratch)
 

diff --git a/imageroot/systemd/user/glpi-app.service b/imageroot/systemd/user/glpi-app.service
@@ -22,7 +22,7 @@ ExecStartPost=/usr/bin/bash -c "while ! podman exec -ti mariadb-app mysql -u glp
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/glpi-app.pid \
     --cidfile %t/glpi-app.ctr-id --cgroups=no-conmon \
     --pod-id-file %t/glpi.pod-id --replace -d --name  glpi-app \
-    --volume glpi_html:/var/www/html/glpi \
+    --volume glpi_html:/var/www/html/glpi:z \
     --env=GLPI_* \
     --env TIMEZONE=Europe/Brussels \
     --env MARIADB_DB_TYPE=mysql \