glpi update

.gitea/workflows/build_and_publish.yaml

@@ -7,10 +7,8 @@ env:
 
 on:
   push:
-    tags:
-      - '*'
   schedule:
-    - cron: "0 12 3 * *"
+    - cron: "0 12 * * 3"
   workflow_dispatch:
   workflow_call:
   workflow_run:
@@ -49,14 +47,14 @@ jobs:
           cd src && \
           docker build \
             --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-${{ matrix.arch }} \
-            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10-${{ matrix.arch }} \
+            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-${{ matrix.arch }} \
-            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20-${{ matrix.arch }} \
+            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-${{ matrix.arch }} \
-            --build-arg "GLPI_VERSION=10.0.20" \
+            --build-arg "GLPI_VERSION=11.0.1" \
-            --build-arg "ALPINE_VERSION=3.21" \
+            --build-arg "ALPINE_VERSION=3.22" \
-            --platform linux/${{ matrix.arch }} -f Dockerfile .
+            --platform linux/${{ matrix.arch }} --no-cache -f Dockerfile .
           docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-${{ matrix.arch }}
-          docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10-${{ matrix.arch }}
+          docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-${{ matrix.arch }}
-          docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20-${{ matrix.arch }}
+          docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-${{ matrix.arch }}
 
   manifest:
     name: update docker manifest
@@ -81,18 +79,18 @@ jobs:
             --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-arm64
           docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest
 
-      - name: "10"
+      - name: "11"
         run: |
           docker manifest create \
-            ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10 \
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11 \
-            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10-amd64 \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-amd64 \
-            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10-arm64
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-arm64
-          docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10
+          docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11
 
-      - name: "10.0.20"
+      - name: "11.0.1"
         run: |
           docker manifest create \
-            ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20 \
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1 \
-            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20-amd64 \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-amd64 \
-            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20-arm64
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-arm64
-          docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20
+          docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1

.gitea/workflows/vulnscan.yaml

@@ -61,4 +61,4 @@ jobs:
           token: ${{ secrets.TELEGRAM_TOKEN }}
           format: markdown
           message: |
-            Found **${{ steps.vulncount.outputs.VULNCOUNT }}** vulnerabilities in `${{ github.repository }}`
+            Found **${{ steps.vulncount.outputs.VULNCOUNT }}** vulnerabilities in `${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest`

README.md

@@ -8,7 +8,7 @@ Web server for GLPI deployment
 
 ```bash
 cd src
-docker build -t docker.asperti.com/paspo/glpi --build-arg "ALPINE_VERSION=3.19" --build-arg "GLPI_VERSION=10.0.11" .
+docker build -t docker.asperti.com/paspo/glpi --build-arg "ALPINE_VERSION=3.22" --build-arg "GLPI_VERSION=11.0.1" .
 ```
 
 ## run

docker-compose.yaml

@@ -1,8 +1,6 @@
-version: "3.8"
-
 services:
   db:
-    image: mariadb:10
+    image: mariadb:11
     volumes:
       - ./db:/var/lib/mysql
     environment:
@@ -14,18 +12,37 @@ services:
     logging:
       options:
         max-size: 10m
+    healthcheck:
+      test: [ "CMD", "healthcheck.sh", "--connect", "--innodb_initialized" ]
+      start_period: 1m
+      start_interval: 10s
+      interval: 1m
+      timeout: 5s
+      retries: 3
 
   redis:
     image: redis:alpine
     logging:
       options:
         max-size: 10m
+    healthcheck:
+      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
+      start_period: 20s
+      interval: 30s
+      retries: 5
+      timeout: 3s
 
   glpi:
-    build: .
+    build: 
+      context: src
+      args:
+        ALPINE_VERSION: 3.22
+        GLPI_VERSION: 11.0.1
     depends_on:
-      - db
+      db:
-      - redis
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     ports:
       - 8282:80
     environment:

src/Dockerfile

@@ -1,4 +1,4 @@
-ARG ALPINE_VERSION
+ARG ALPINE_VERSION=3.22
 FROM alpine:${ALPINE_VERSION}
 ARG GLPI_VERSION
 
@@ -6,7 +6,7 @@ RUN \
   mkdir -p /logs /config /files /marketplace && \
   apk -U upgrade && \
   apk add --no-cache curl nginx php83 php83-bz2 php83-ctype php83-curl php83-dom php83-exif \
-    php83-fileinfo php83-fpm php83-gd php83-iconv php83-intl php83-ldap php83-mysqli \
+    php83-fileinfo php83-fpm php83-gd php83-iconv php83-intl php83-ldap php83-mysqli php83-bcmath \
     php83-opcache php83-openssl php83-pecl-apcu php83-pecl-redis php83-phar php83-session \
     php83-simplexml php83-sodium php83-tokenizer php83-xml php83-zip php83-xmlreader php83-xmlwriter && \
   wget -O /usr/local/bin/composer https://getcomposer.org/download/2.5.8/composer.phar && \