From ced75b5b3800fdc55971a26453c374f6ff92b457 Mon Sep 17 00:00:00 2001 From: nfc_bot Date: Sun, 30 Jun 2024 17:46:01 +0000 Subject: [PATCH 1/5] chore(git): updated submodule gitlab-ci Automation Data: { "branch": "development", "current_commit": "a24f352ca3d82b8d0f02f5db20173fe2c3f71a4a)", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/docker-glpi/_automation_/gitlab-ci", "remote_head": "673441f83a7d943434252ee23899e3572cdfb141)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } Changes: Submodule path gitlab-ci: checked out 673441f83a7d943434252ee23899e3572cdfb141 MR !35 --- gitlab-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci b/gitlab-ci index a24f352..673441f 160000 --- a/gitlab-ci +++ b/gitlab-ci @@ -1 +1 @@ -Subproject commit a24f352ca3d82b8d0f02f5db20173fe2c3f71a4a +Subproject commit 673441f83a7d943434252ee23899e3572cdfb141 -- 2.49.0 From 39a4ed07d4af2ed54a372ffb675a35829f37dab3 Mon Sep 17 00:00:00 2001 From: nfc_bot Date: Sun, 30 Jun 2024 17:48:09 +0000 Subject: [PATCH 2/5] chore(git): updated submodule website-template Automation Data: { "branch": "development", "current_commit": "f5a82d3604faca56756eec91acee28ff89defd1d)", "name": "website-template", "path": "/builds/nofusscomputing/projects/docker-glpi/_automation_/website-template", "remote_head": "92c4b16a14524e7b5b18171d4e21b72676c36fbf)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/infrastructure/website-template.git" } Changes: Submodule path website-template: checked out 92c4b16a14524e7b5b18171d4e21b72676c36fbf MR !36 --- website-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website-template b/website-template index f5a82d3..92c4b16 160000 --- a/website-template +++ b/website-template @@ -1 +1 @@ -Subproject commit f5a82d3604faca56756eec91acee28ff89defd1d +Subproject commit 92c4b16a14524e7b5b18171d4e21b72676c36fbf -- 2.49.0 From 127dd11c596c79af61afff0a3d066c2c1c21c550 Mon Sep 17 00:00:00 2001 From: nfc_bot Date: Sun, 30 Jun 2024 18:03:34 +0000 Subject: [PATCH 3/5] chore(git): updated submodule website-template Automation Data: { "branch": "development", "current_commit": "92c4b16a14524e7b5b18171d4e21b72676c36fbf)", "name": "website-template", "path": "/builds/nofusscomputing/projects/docker-glpi/_automation_/website-template", "remote_head": "8735f623dc5e1d9c9e46e50db03b4c41cb3d1efd)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/infrastructure/website-template.git" } Changes: Submodule path website-template: checked out 8735f623dc5e1d9c9e46e50db03b4c41cb3d1efd MR !37 --- website-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website-template b/website-template index 92c4b16..8735f62 160000 --- a/website-template +++ b/website-template @@ -1 +1 @@ -Subproject commit 92c4b16a14524e7b5b18171d4e21b72676c36fbf +Subproject commit 8735f623dc5e1d9c9e46e50db03b4c41cb3d1efd -- 2.49.0 From 9f2403aa2f100e2c6a920744d3972faf3fe7ea75 Mon Sep 17 00:00:00 2001 From: nfc_bot Date: Thu, 1 Aug 2024 06:08:19 +0000 Subject: [PATCH 4/5] chore(git): updated submodule gitlab-ci Automation Data: { "branch": "development", "current_commit": "673441f83a7d943434252ee23899e3572cdfb141)", "name": "gitlab-ci", "path": "/builds/nofusscomputing/projects/docker-glpi/_automation_/gitlab-ci", "remote_head": "58ffcabbfb503af3e57d9cb3ab43931b23dc4cd8)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/gitlab-ci.git" } Changes: Submodule path gitlab-ci: checked out 58ffcabbfb503af3e57d9cb3ab43931b23dc4cd8 MR !38 --- gitlab-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci b/gitlab-ci index 673441f..58ffcab 160000 --- a/gitlab-ci +++ b/gitlab-ci @@ -1 +1 @@ -Subproject commit 673441f83a7d943434252ee23899e3572cdfb141 +Subproject commit 58ffcabbfb503af3e57d9cb3ab43931b23dc4cd8 -- 2.49.0 From 01d78e0bfb32aee9701379f1cb96f971100d1946 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 1 Aug 2024 16:01:42 +0930 Subject: [PATCH 5/5] feat: Bump GLPI version 10.0.15 -> 10.0.16 !34 --- README.md | 2 ++ dockerfile | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e86a6a0..31c8a71 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ ![Project Status - Active](https://img.shields.io/badge/Project%20Status-Active-green?logo=gitlab&style=plastic) +[![Docker Pulls](https://img.shields.io/docker/pulls/nofusscomputing/docker-glpi?style=plastic&logo=docker&color=0db7ed)](https://hub.docker.com/r/nofusscomputing/docker-glpi) [![Artifact Hub](https://img.shields.io/endpoint?style=plastic&url=https://artifacthub.io/badge/repository/nfc-docker-glpi)](https://artifacthub.io/packages/search?repo=nfc-docker-glpi) +
![Gitlab forks count](https://img.shields.io/badge/dynamic/json?label=Forks&query=%24.forks_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F12928828%2F&color=ff782e&logo=gitlab&style=plastic) ![Gitlab stars](https://img.shields.io/badge/dynamic/json?label=Stars&query=%24.star_count&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F12928828%2F&color=ff782e&logo=gitlab&style=plastic) [![Open Issues](https://img.shields.io/badge/dynamic/json?color=ff782e&logo=gitlab&style=plastic&label=Open%20Issues&query=%24.statistics.counts.opened&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F12928828%2Fissues_statistics)](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues) diff --git a/dockerfile b/dockerfile index 6514156..4ccf466 100644 --- a/dockerfile +++ b/dockerfile @@ -1,4 +1,4 @@ -ARG GLPI_VERSION=10.0.15 +ARG GLPI_VERSION=10.0.16 ARG VERSION_PHP=8.2 FROM debian:bookworm-slim as prepare @@ -35,6 +35,13 @@ RUN export GLPI_URL=$(curl -s https://api.github.com/repos/glpi-project/glpi/rel FROM debian:bookworm-slim +LABEL \ + org.opencontainers.image.vendor="No Fuss Computing" \ + org.opencontainers.image.title="GLPI" \ + org.opencontainers.image.description="GLPI Within a docker container" \ + org.opencontainers.image.vendor="No Fuss Computing" \ + io.artifacthub.package.license="MIT" + ARG GLPI_VERSION ARG VERSION_PHP -- 2.49.0