Merge pull request #10 from geniusdynamics/genius-glpi

Implement merge genius-dlpi which uses the self contained glpi docker image from genius
geniusdynamics · Mar 24, 2024 · df9b5a2 · df9b5a2
2 parents 2a25db7 + fcc36ea
commit df9b5a2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 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"
 # Create a new empty container image
 container=$(buildah from scratch)
 
@@ -45,7 +45,7 @@ buildah config --entrypoint=/ \
     --label="org.nethserver.authorizations=traefik@node:routeadm" \
     --label="org.nethserver.tcp-ports-demand=1" \
     --label="org.nethserver.rootfull=0" \
-    --label="org.nethserver.images=docker.io/mariadb:10.11.5 docker.io/geniusdynamics/glpi:latest" \
+    --label="org.nethserver.images=docker.io/mariadb:10.11.5 docker.io/geniusdynamics/glpi:${app_version}" \
     "${container}"
 # Commit the image
 buildah commit "${container}" "${repobase}/${reponame}"

diff --git a/imageroot/actions/restore-module/50traefik b/imageroot/actions/restore-module/50traefik
@@ -14,8 +14,8 @@ request = json.load(sys.stdin)
 renv = request['environment']
 
 configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={
-    "lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"],
+    "lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"] == True,
     "host": renv["TRAEFIK_HOST"],
-    "http2https": renv["TRAEFIK_HTTP2HTTPS"],
+    "http2https": renv["TRAEFIK_HTTP2HTTPS"] == True,
 })
 agent.assert_exp(configure_retval['exit_code'] == 0, "The configure-module subtask failed!")
diff --git a/imageroot/systemd/user/glpi-app.service b/imageroot/systemd/user/glpi-app.service
@@ -24,7 +24,6 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/glpi-app.pid \
     --pod-id-file %t/glpi.pod-id --replace -d --name  glpi-app \
     --volume glpi_html:/var/www/html/glpi \
     --env=GLPI_* \
-    --env VERSION_GLPI=10.0.14 \
     --env TIMEZONE=Europe/Brussels \
     --env MARIADB_DB_TYPE=mysql \
     --env MARIADB_DB_HOST=127.0.0.1 \

diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
@@ -31,6 +31,7 @@
     "disabled": "Disabled",
     "advanced": "Advanced",
     "configuring": "Configuring",
+    "instance_configuration": "Configure glpi Please wait as glpi services are started",
     "instance_configuration": "Configure glpi",
     "domain_already_used_in_traefik": "Domain already used in traefik",
     "host_pattern": "Must be a valid fully qualified domain name",