glpi update

.dockerignore

@@ -1,6 +0,0 @@
-db/
-glpi/
-docker-compose.yaml
-.drone.yaml
-.env
-.gitignore

.drone.yaml

@@ -1,49 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: build_and_publish_tag
-    image: plugins/docker:linux-amd64
-    settings:
-      force_tag: true
-      password:
-        from_secret: docker_password
-      registry: docker.asperti.com
-      repo: docker.asperti.com/paspo/glpi
-      context: .
-      dockerfile: ./Dockerfile
-      build_args:
-        - GLPI_VERSION=10.0.8
-      username:
-        from_secret: docker_username
-      tags:
-        - latest
-        - ${DRONE_TAG}
-        - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
-    when:
-      event:
-        - tag
-
-  - name: build_and_publish
-    image: plugins/docker:linux-amd64
-    settings:
-      force_tag: true
-      password:
-        from_secret: docker_password
-      registry: docker.asperti.com
-      repo: docker.asperti.com/paspo/glpi
-      context: .
-      dockerfile: ./Dockerfile
-      build_args:
-        - GLPI_VERSION=10.0.8
-      username:
-        from_secret: docker_username
-      tags:
-        - latest
-    when:
-      branch:
-        - master
-      event:
-        - push
-        - cron

.gitea/workflows/build_and_publish.yaml

@@ -0,0 +1,96 @@
+---
+name: Container Publish
+
+env:
+  REGISTRY: docker.asperti.com
+  REPOSITORY: paspo/glpi
+
+on:
+  push:
+  schedule:
+    - cron: "0 12 * * 3"
+  workflow_dispatch:
+  workflow_call:
+  workflow_run:
+    workflows: [vulnscan.yaml]
+    types: [completed]
+
+jobs:
+  on-success-skip:
+    runs-on:
+      labels: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - run: exit_with_success
+
+  build-image:
+    runs-on:
+      labels: [ubuntu-latest, "arch-${{ matrix.arch }}"]
+    container:
+      image: catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Build and publish
+        run: |
+          cd src && \
+          docker build \
+            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-${{ matrix.arch }} \
+            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-${{ matrix.arch }} \
+            --tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-${{ matrix.arch }} \
+            --build-arg "GLPI_VERSION=11.0.1" \
+            --build-arg "ALPINE_VERSION=3.22" \
+            --platform linux/${{ matrix.arch }} --no-cache -f Dockerfile .
+          docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-${{ matrix.arch }}
+          docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-${{ matrix.arch }}
+          docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-${{ matrix.arch }}
+
+  manifest:
+    name: update docker manifest
+    needs: build-image
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+
+    steps:
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: latest
+        run: |
+          docker manifest create \
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-amd64 \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest-arm64
+          docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest
+
+      - name: "11"
+        run: |
+          docker manifest create \
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11 \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-amd64 \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-arm64
+          docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11
+
+      - name: "11.0.1"
+        run: |
+          docker manifest create \
+            ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1 \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-amd64 \
+            --amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1-arm64
+          docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.1

.gitea/workflows/vulnscan.yaml

@@ -0,0 +1,64 @@
+---
+name: Vulnerability Scan
+
+env:
+  REGISTRY: docker.asperti.com
+  REPOSITORY: paspo/glpi
+
+on:
+  schedule:
+    - cron: "0 14 * * *"
+  workflow_dispatch:
+  workflow_call:
+  workflow_run:
+    workflows: [build_and_publish.yaml]
+    types: [completed]
+
+jobs:
+  scan:
+    name: Daily Vulnerability Scan
+    runs-on:
+      labels: [ubuntu-latest, "arch-${{ matrix.arch }}"]
+    container:
+      image: catthehacker/ubuntu:act-latest
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+
+    steps:
+      - name: Pull docker image
+        run: docker pull ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest
+
+      - name: Setup trivy
+        run: |
+          echo "Installing Trivy for arch: $(uname -m)"
+          case $(uname -m) in
+            x86_64)
+              wget -O /tmp/trivy.deb https://github.com/aquasecurity/trivy/releases/download/v0.58.2/trivy_0.58.2_Linux-64bit.deb ;;
+            aarch64)
+              wget -O /tmp/trivy.deb https://github.com/aquasecurity/trivy/releases/download/v0.58.2/trivy_0.58.2_Linux-ARM64.deb ;;
+            *) exit 1 ;;
+          esac
+          dpkg -i /tmp/trivy.deb
+
+      - name: Run Trivy vulnerability scanner
+        id: scan
+        run: |
+          trivy --server ${{ secrets.TRIVY_SERVER }} --token ${{ secrets.TRIVY_TOKEN }} image --format json ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest > trivy-results.json
+
+      # if some vulnerability is found, we fail
+      - name: check output
+        id: vulncount
+        run: |
+          echo "VULNCOUNT=$(jq '.Results[0].Vulnerabilities|length' trivy-results.json)" >> ${GITHUB_OUTPUT}
+          if [ $(jq '.Results[0].Vulnerabilities|length' trivy-results.json) -ne "0" ] ; then exit 1 ; fi
+
+      - name: send telegram notification
+        if: failure()
+        uses: appleboy/telegram-action@master
+        with:
+          to: ${{ secrets.TELEGRAM_TO }}
+          token: ${{ secrets.TELEGRAM_TOKEN }}
+          format: markdown
+          message: |
+            Found **${{ steps.vulncount.outputs.VULNCOUNT }}** vulnerabilities in `${{ env.REGISTRY }}/${{ env.REPOSITORY }}:latest`

Dockerfile

@@ -1,20 +0,0 @@
-FROM alpine:3.18
-ARG GLPI_VERSION=10.0.8
-
-RUN \
-  mkdir -p /logs /config /files /marketplace && \
-  apk -U upgrade && \
-  apk add curl nginx php82 php82-bz2 php82-ctype php82-curl php82-dom php82-exif \
-    php82-fileinfo php82-fpm php82-gd php82-iconv php82-intl php82-ldap php82-mysqli \
-    php82-opcache php82-openssl php82-pecl-apcu php82-pecl-redis php82-phar php82-session \
-    php82-simplexml php82-sodium php82-xml php82-zip php82-xmlreader php82-xmlwriter && \
-  wget -O - https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/glpi-${GLPI_VERSION}.tgz | tar xz -C /var/www
-
-COPY rootfs /
-
-# config test
-RUN nginx -t
-
-HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping
-
-ENTRYPOINT [ "/bin/sh", "/start.sh" ]

README.md

@@ -7,10 +7,22 @@ Web server for GLPI deployment
 ## build
 
 ```bash
-git submodule update --init --remote
-docker build -t docker.asperti.com/paspo/glpi .
+cd src
+docker build -t docker.asperti.com/paspo/glpi --build-arg "ALPINE_VERSION=3.22" --build-arg "GLPI_VERSION=11.0.1" .
 ```
 
 ## run
 
 see [docker-compose.yaml](docker-compose.yaml)
+
+## test drone config
+
+```sh
+drone starlark --format --stdout 
+```
+
+## run vulnscan locally
+
+```bash
+act -W .gitea/workflows/vulnscan.yaml -j scan
+```

docker-compose.yaml

@@ -1,8 +1,6 @@
-version: "3.8"
-
 services:
   db:
-    image: mariadb:10
+    image: mariadb:11
     volumes:
       - ./db:/var/lib/mysql
     environment:
@@ -10,15 +8,41 @@ services:
       - MARIADB_DATABASE=${MARIADB_DATABASE}
       - MARIADB_USER=${MARIADB_USER}
       - MARIADB_PASSWORD=${MARIADB_PASSWORD}
+      - MARIADB_AUTO_UPGRADE=1
+    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:latest
+    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
-      - redis
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     ports:
       - 8282:80
     environment:
@@ -29,3 +53,6 @@ services:
       - ./glpi/files:/files
       - ./glpi/marketplace:/marketplace
       - ./glpi/plugins:/var/www/glpi/plugins
+    logging:
+      options:
+        max-size: 10m      

src/Dockerfile

@@ -0,0 +1,30 @@
+ARG ALPINE_VERSION=3.22
+FROM alpine:${ALPINE_VERSION}
+ARG GLPI_VERSION
+
+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-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 && \
+  chmod +x /usr/local/bin/composer && \
+  wget -O - https://github.com/glpi-project/glpi/releases/download/${GLPI_VERSION}/glpi-${GLPI_VERSION}.tgz | tar xz -C /var/www
+
+# GLPI 10.x will work only with PHP up to 8.3.
+# do not trust README.md from glpi github (it says it works with 8.4, but it dies if >=8.4.0)
+
+# this are needed if you want to manually install GLPI from git
+# RUN \
+#   apk add patch npm gettext
+
+COPY rootfs /
+
+# config test
+RUN nginx -t
+
+HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping
+
+ENTRYPOINT [ "/bin/sh", "/start.sh" ]

src/rootfs/etc/crontabs/nginx

@@ -0,0 +1,2 @@
+# min	hour	day	month	weekday	command
+*	*	*	*	*	/usr/bin/php /var/www/glpi/front/cron.php 

src/rootfs/etc/php83/conf.d/php.ini

@@ -1,6 +1,8 @@
 session.cookie_httponly = on
-memory_limit = 256M
+memory_limit = 512M
 file_uploads = on
 max_execution_time = 600
 session.auto_start = off
 session.use_trans_sid = 0
+expose_php = Off
+opcache.memory_consumption = 256

src/rootfs/start.sh

@@ -1,13 +1,16 @@
 #!/bin/sh
 
+INSTALL_OK=${INSTALL_OK:-0}
+
 chown -R nginx:www-data /logs /config /files /marketplace
 chmod -R a-x,a=rX,ug+w  /logs /config /files /marketplace
 
-if [ "$INSTALL_OK" = "1" ] ; then
+if [ "${INSTALL_OK}" = "1" ] ; then
   if [ -f /var/www/glpi/install/install.php ] ; then 
     rm /var/www/glpi/install/install.php
   fi
 fi
 
+/usr/sbin/crond -b
 /usr/sbin/php-fpm*
 /usr/sbin/nginx