Merge branch 'automated-tasks' into 'development'

chore(gitlab-ci): Automated update of git sub-module

See merge request nofusscomputing/projects/docker-glpi!42

.cz.yaml

@@ -4,4 +4,4 @@ commitizen:
   name: cz_conventional_commits
   tag_format: $major.$minor.$patch$prerelease
   update_changelog_on_bump: true
-  version: 0.1.0rc1
+  version: 0.7.0

.gitlab-ci.yml

@@ -15,3 +15,25 @@ include:
     file:
       - template/automagic.gitlab-ci.yaml
   #- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665
+
+
+Website.Submodule.Deploy:
+  extends: .submodule_update_trigger
+  variables:
+    SUBMODULE_UPDATE_TRIGGER_PROJECT: nofusscomputing/infrastructure/website
+  environment:
+    url: https://nofusscomputing.com/$PAGES_ENVIRONMENT_PATH
+    name: Documentation
+  rules:
+    - if:  # condition_dev_branch_push
+        $CI_COMMIT_BRANCH == "development" && 
+        $CI_PIPELINE_SOURCE == "push"
+      exists:
+        - '{docs/**,pages/**}/*.md'
+      changes:
+        paths:
+          - '{docs/**,pages/**}/*.md'
+        compare_to: 'master'
+      when: always
+
+    - when: never

CHANGELOG.md

@@ -1,3 +1,57 @@
+## 0.7.0 (2024-08-01)
+
+### Features
+
+- [01d78e0b](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/01d78e0bfb32aee9701379f1cb96f971100d1946) - Bump GLPI version 10.0.15 -> 10.0.16 [ [!34](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/34) ]
+
+## 0.6.0 (2024-05-31)
+
+### Features
+
+- [ec51bf83](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/ec51bf8328a5be9f589b314a2c38b9c213127dcb) - Bump GLPI version 10.0.14 -> 10.0.15 [ [!34](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/34) ]
+
+## 0.5.0 (2024-03-27)
+
+### Features
+
+- [0ccc5eec](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/0ccc5eec3de8773fde1c9cbf0b85ecb3ce66d1c8) - Bump base image debian-bullseye -> debian-bookworm [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
+- [7c6cc8f9](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/7c6cc8f9736246f62ad7c677a1361a96a4520c0f) - Bump GLPI version 10.0.12 -> 10.0.14 [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
+- [816c6307](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/816c6307605be92c396f1c3eaabedd414fe56c83) - add custom theme 'nfc' [ [!32](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/32) ]
+
+## 0.4.0 (2024-02-01)
+
+### Features
+
+- [0f9b2038](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/0f9b203815e69156fbbd538edf19cf7f22654e4d) - Bump GLPI version to 10.0.12 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
+
+## 0.3.0 (2024-01-09)
+
+### Features
+
+- **php**: [dffc7014](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/dffc70141f46cf7f719aa928bd76aa4e55b67a0d) - Bumped to version 8.2 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
+- **glpi**: [4820e30d](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/4820e30d551d904d4781e503ca2c8adb7a336fbd) - Bumped to version 10.0.11 [ [!13](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/13) ]
+
+## 0.2.0 (2023-10-28)
+
+### Features
+
+- **glpi**: [a50e33cb](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/a50e33cbc96b2d6791f8ae288e1beea88a459f38) - Bumped to version 10.0.10 [ [!7](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/7) ]
+
+## 0.1.0 (2023-08-30)
+
+### Bug Fixes
+
+- **dockerfile**: [68851755](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/688517556a748c2ac74d657d573b4ee79a1e48d3) - ensure CA certs available prior to apt install [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) ]
+- **dockerfile**: [5884c49f](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/5884c49f8aacfc25e5b79e1fe1edb745891b9c85) - silently fail if file doesn't exist on delete [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
+
+### Code Refactor
+
+- **docker**: [1973f5e0](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/1973f5e00358be11e2c82ea0fdfb0f32430fa0b6) - dockerfile move php version to arg [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
+
+### Features
+
+- **php**: [6278fbb3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/commit/6278fbb3dce77dc01dedcb4cefa91b428eaa9135) - upgrade php to 8.1 [ [!4](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/merge_requests/4) [#3](https://gitlab.com/nofusscomputing/projects/docker-glpi/-/issues/3) ]
+
 ## 0.1.0rc1 (2023-08-30)
 
 ### Bug Fixes

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)
+
 <br>
 
 ![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)

dockerfile

@@ -1,11 +1,13 @@
-ARG GLPI_VERSION=10.0.9
+ARG GLPI_VERSION=10.0.16
+ARG VERSION_PHP=8.2
 
-FROM debian:bullseye-slim as prepare
+FROM debian:bookworm-slim as prepare
 
 ARG GLPI_VERSION
+ARG VERSION_PHP
 
 ENV GLPI_VERSION $GLPI_VERSION
-
+ENV VERSION_PHP $VERSION_PHP
 # RUN echo "Acquire::http::Proxy \"http://192.168.1.172:3142\";\nAcquire::https::Proxy \"http://192.168.1.172:3142\";" > /etc/apt/apt.conf.d/apt_proxy.conf
 
 
@@ -31,19 +33,28 @@ RUN export GLPI_URL=$(curl -s https://api.github.com/repos/glpi-project/glpi/rel
   tar -xzf /tmp/${TAR_FILENAME} -C /tmp;
 
 
-FROM debian:bullseye-slim
+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
 
 
 ENV DEBIAN_FRONTEND noninteractive
 
 ENV GLPI_VERSION $GLPI_VERSION
 
- 
+ENV VERSION_PHP $VERSION_PHP
+
 #COPY --from=prepare /etc/apt/apt.conf.d/apt_proxy.conf /etc/apt/apt.conf.d/apt_proxy.conf
-  
+
 COPY --from=prepare /usr/share/keyrings/deb.sury.org-php.gpg /usr/share/keyrings/deb.sury.org-php.gpg
 
 COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php.list
@@ -51,29 +62,33 @@ COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php
 
 RUN apt update; \
   apt install --no-install-recommends -y \
-    apache2 \
-    php7.4 \
-    php7.4-mysql \
-    php7.4-ldap \
-    php7.4-xmlrpc \
-    php7.4-imap \
-    php7.4-curl \
-    php7.4-gd \
-    php7.4-mbstring \
-    php7.4-xml \
-    php-cas \
-    php7.4-intl \
-    php7.4-zip \
-    php7.4-bz2 \
-    php7.4-redis \
+    ca-certificates \
     \
     cron \
-    supervisor \
-    ca-certificates; \
-    rm -rf /var/lib/apt/lists/*; \
-    rm -rf /var/www/html; \
-    rm /etc/apt/apt.conf.d/apt_proxy.conf; \
-    a2enmod rewrite;
+    supervisor; \
+  rm -rf /var/lib/apt/lists/*;
+
+RUN apt update; \
+  apt install --no-install-recommends -y \
+    apache2 \
+    php$VERSION_PHP \
+    php$VERSION_PHP-mysql \
+    php$VERSION_PHP-ldap \
+    php$VERSION_PHP-xmlrpc \
+    php$VERSION_PHP-imap \
+    php$VERSION_PHP-curl \
+    php$VERSION_PHP-gd \
+    php$VERSION_PHP-mbstring \
+    php$VERSION_PHP-xml \
+    php-cas \
+    php$VERSION_PHP-intl \
+    php$VERSION_PHP-zip \
+    php$VERSION_PHP-bz2 \
+    php$VERSION_PHP-redis; \
+  rm -rf /var/lib/apt/lists/*; \
+  rm -rf /var/www/html; \
+  rm -f /etc/apt/apt.conf.d/apt_proxy.conf; \
+  a2enmod rewrite;
 
 
 COPY --from=prepare /tmp/glpi /var/www/html

includes/var/www/html/css/palettes/nfc.scss

@@ -0,0 +1,102 @@
+
+$primary: #73bcf7;
+$primary-fg: #f0f0f0;
+
+$secondary: #7e7e7e;
+$secondary-fg: #73ff00;
+
+$dark: #212427;
+$light: #f0f0f0;
+
+$link-color: #0066cc;
+$mainmenu_bg: #212427;
+$mainmenu_fg: #f0f0f0;
+$accent-color: #73bcf7;
+$text-muted: #666666;
+
+
+@import "../includes/palette_light";
+
+
+/*
+* ---------------------------------------------------------------------
+* CSS
+* ---------------------------------------------------------------------
+*/
+.navbar-vertical.navbar-expand-lg {
+    width: 275px
+}
+
+.navbar-expand-lg.navbar-vertical ~ .navbar, .navbar-expand-lg.navbar-vertical ~ .page-wrapper {
+    margin-left: 275px;
+}
+
+.navbar-light {
+    //box-shadow: inset 0 -1px 0 0 rgba(98, 105, 118, 0.16);
+    background-color: #151515;
+}
+
+
+.navbar {
+    min-height: 76px;
+}
+
+
+span.input-group-text {
+    visibility: hidden;
+    border-radius: 4px;
+}
+
+
+
+// Header Entity button
+.navbar .text-muted {
+    color: $accent-color !important;
+    opacity: 70%;
+  }
+
+
+body {
+    --tblr-body-bg: #f0f0f0;
+}
+
+@include media-breakpoint-up(lg) {
+    body.navbar-collapsed {
+        .sidebar {
+            #navbar-menu {
+                .nav-item {
+                    .nav-link {
+                        & + .dropdown-menu {
+                            
+                            color: $accent-color;
+                            border: 1px solid $accent-color;
+
+                            .dropdown-item {
+                                &.hover {
+                                    border-left-color: $accent-color;
+                                }
+
+                                &.active {
+                                    background-color: lighten($mainmenu-bg, 40%);
+                                    border-left-color: $accent-color;
+                                }
+                            }
+                        }
+                    }
+                    
+                }
+            }
+        }
+    }
+}
+
+.dashboard {
+
+    .card {
+        box-shadow: none !important;
+
+        margin: 0 !important;
+        border-radius: 5px !important;
+    }
+
+}