glpi upgrade
Some checks failed
Container Publish / on-success-skip (push) Has been skipped
Container Publish / build-image (arm64) (push) Successful in 18s
Container Publish / build-image (amd64) (push) Successful in 1m8s
Container Publish / update docker manifest (push) Successful in 19s
Vulnerability Scan / Daily Vulnerability Scan (arm64) (push) Failing after 5s
Vulnerability Scan / Daily Vulnerability Scan (amd64) (push) Failing after 6s

This commit is contained in:
2025-10-02 09:51:47 +02:00
parent 903858dd62
commit b3e1301121
4 changed files with 22 additions and 20 deletions

View File

@@ -47,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 }}:10.0.20-${{ matrix.arch }} \
--build-arg "GLPI_VERSION=10.0.20" \
--tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-${{ matrix.arch }} \
--tag ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.0-${{ matrix.arch }} \
--build-arg "GLPI_VERSION=11.0.0" \
--build-arg "ALPINE_VERSION=3.22" \
--platform linux/${{ matrix.arch }} -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 }}:10.0.20-${{ matrix.arch }}
docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11-${{ matrix.arch }}
docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.0-${{ matrix.arch }}
manifest:
name: update docker manifest
@@ -79,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 \
--amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10-amd64 \
--amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10-arm64
docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10
${{ 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: "10.0.20"
- name: "11.0.0"
run: |
docker manifest create \
${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20 \
--amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20-amd64 \
--amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20-arm64
docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:10.0.20
${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.0 \
--amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.0-amd64 \
--amend ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.0-arm64
docker manifest push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:11.0.0

View File

@@ -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.22" --build-arg "GLPI_VERSION=10.0.20" .
docker build -t docker.asperti.com/paspo/glpi --build-arg "ALPINE_VERSION=3.22" --build-arg "GLPI_VERSION=11.0.0" .
```
## run

View File

@@ -1,5 +1,3 @@
version: "3.8"
services:
db:
image: mariadb:11
@@ -35,7 +33,11 @@ services:
timeout: 3s
glpi:
build: .
build:
context: src
args:
ALPINE_VERSION: 3.22
GLPI_VERSION: 11.0.0
depends_on:
db:
condition: service_healthy

View File

@@ -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 && \