+
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Manifest files for building and deploying **GLPI** using containers with Docker

- [x] PHP-FPM: `php:8.3.12-fpm-alpine3.20`
- [x] Nginx: `nginxinc/nginx-unprivileged:1.27.5-alpine3.21-slim`
- [x] GLPI PHP: `eftechcombr/glpi:php-fpm-10.0.18`
- [x] GLPI Nginx: `eftechcombr/glpi:nginx-10.0.18`
- [x] GLPI PHP: `eftechcombr/glpi:php-fpm-10.0.19`
- [x] GLPI Nginx: `eftechcombr/glpi:nginx-10.0.19`

## Quick Start

Expand Down
2 changes: 1 addition & 1 deletion docker/.env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GLPI_LANG="en_US"
VERSION="10.0.18"
VERSION="10.0.19"
GLPI_MARKETPLACE_DIR=/var/www/html/marketplace
GLPI_VAR_DIR=/var/lib/glpi
GLPI_DOC_DIR=/var/lib/glpi
Expand Down
14 changes: 7 additions & 7 deletions docker/docker-compose-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
command: mariadb -h $MARIADB_HOST -u root -p$MARIADB_ROOT_PASSWORD -e "GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO 'glpi'@'%'; FLUSH PRIVILEGES;"

glpi-db-install:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
env_file: ./.env
volumes:
Expand All @@ -35,7 +35,7 @@ services:
- /usr/local/bin/glpi-db-install.sh

glpi-verify-dir:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -48,7 +48,7 @@ services:
- /usr/local/bin/glpi-verify-dir.sh

glpi-db-configure:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -61,7 +61,7 @@ services:
- /usr/local/bin/glpi-db-configure.sh

glpi-cache-configure:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -84,7 +84,7 @@ services:

php:
build: php/
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: unless-stopped
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -101,10 +101,10 @@ services:

nginx:
build: nginx/
image: eftechcombr/glpi:nginx-10.0.18
image: eftechcombr/glpi:nginx-10.0.19
restart: unless-stopped
ports:
- "8080:80"
- "8080:8080"
depends_on:
- php

Expand Down
14 changes: 7 additions & 7 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
command: mariadb -h $MARIADB_HOST -u root -p$MARIADB_ROOT_PASSWORD -e "GRANT SELECT ON \`mysql\`.\`time_zone_name\` TO 'glpi'@'%'; FLUSH PRIVILEGES;"

glpi-db-install:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
env_file: ./.env
volumes:
Expand All @@ -35,7 +35,7 @@ services:
- /usr/local/bin/glpi-db-install.sh

glpi-verify-dir:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -48,7 +48,7 @@ services:
- /usr/local/bin/glpi-verify-dir.sh

glpi-db-configure:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -60,7 +60,7 @@ services:
command:
- /usr/local/bin/glpi-db-configure.sh
glpi-cache-configure:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: on-failure
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -73,7 +73,7 @@ services:
- /usr/local/bin/glpi-cache-configure.sh

php:
image: eftechcombr/glpi:php-fpm-10.0.18
image: eftechcombr/glpi:php-fpm-10.0.19
restart: unless-stopped
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -89,10 +89,10 @@ services:
- "9000:9000"

nginx:
image: eftechcombr/glpi:nginx-10.0.18
image: eftechcombr/glpi:nginx-10.0.19
restart: unless-stopped
ports:
- "8080:80"
- "8080:8080"
depends_on:
- php

Expand Down
2 changes: 1 addition & 1 deletion docker/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eftechcombr/glpi:php-fpm-10.0.18 as BUILD
FROM eftechcombr/glpi:php-fpm-10.0.19 as BUILD
#

FROM nginxinc/nginx-unprivileged:1.27.5-alpine3.21-slim
Expand Down
2 changes: 1 addition & 1 deletion docker/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM eftechcombr/glpi:base

ENV VERSION=10.0.18
ENV VERSION=10.0.19
ENV GLPI_LANG=en_US
ENV CACHE_DSN=redis://redis:6379/
ENV MARIADB_HOST=mariadb-glpi
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/glpi-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: glpi
data:
GLPI_LANG: "en_US"
VERSION: "10.0.18"
VERSION: "10.0.19"
GLPI_MARKETPLACE_DIR: /var/www/html/marketplace
GLPI_VAR_DIR: /var/lib/glpi
GLPI_DOC_DIR: /var/lib/glpi
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/glpi-cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.18
- image: eftechcombr/glpi:php-fpm-10.0.19
imagePullPolicy: Always
name: base
envFrom:
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/glpi-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
app: php-fpm
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.18
- image: eftechcombr/glpi:php-fpm-10.0.19
imagePullPolicy: Always
name: php
envFrom:
Expand Down Expand Up @@ -67,7 +67,7 @@ spec:
app: nginx
spec:
containers:
- image: eftechcombr/glpi:nginx-10.0.18
- image: eftechcombr/glpi:nginx-10.0.19
imagePullPolicy: Always
name: nginx
envFrom:
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/glpi-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.18
- image: eftechcombr/glpi:php-fpm-10.0.19
imagePullPolicy: Always
name: base
envFrom:
Expand Down Expand Up @@ -54,7 +54,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.18
- image: eftechcombr/glpi:php-fpm-10.0.19
imagePullPolicy: Always
name: base
command:
Expand Down Expand Up @@ -99,7 +99,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.18
- image: eftechcombr/glpi:php-fpm-10.0.19
imagePullPolicy: Always
name: base
command:
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.18
- image: eftechcombr/glpi:php-fpm-10.0.19
imagePullPolicy: Always
name: base
command:
Expand Down
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载