Thanks to visit codestin.com
Credit goes to github.com

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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Manifest files for building and deploying **GLPI** using containers with Docker

## Supported Containers

- [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.19`
- [x] GLPI Nginx: `eftechcombr/glpi:nginx-10.0.19`
- [x] PHP-FPM: `php:8.4.13-fpm-alpine3.22`
- [x] Nginx: `nginxinc/nginx-unprivileged:1.29.1-alpine3.22-slim`
- [x] GLPI PHP: `eftechcombr/glpi:php-fpm-11.0.0`
- [x] GLPI Nginx: `eftechcombr/glpi:nginx-11.0.0`

## 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.19"
VERSION="11.0.0"
GLPI_MARKETPLACE_DIR=/var/www/html/marketplace
GLPI_VAR_DIR=/var/lib/glpi
GLPI_DOC_DIR=/var/lib/glpi
Expand Down
12 changes: 6 additions & 6 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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
restart: unless-stopped
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -101,7 +101,7 @@ services:

nginx:
build: nginx/
image: eftechcombr/glpi:nginx-10.0.19
image: eftechcombr/glpi:nginx-11.0.0
restart: unless-stopped
ports:
- "8080:8080"
Expand Down
12 changes: 6 additions & 6 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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
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.19
image: eftechcombr/glpi:php-fpm-11.0.0
restart: unless-stopped
volumes:
- glpi-marketplace:/var/www/html/marketplace:rw
Expand All @@ -89,7 +89,7 @@ services:
- "9000:9000"

nginx:
image: eftechcombr/glpi:nginx-10.0.19
image: eftechcombr/glpi:nginx-11.0.0
restart: unless-stopped
ports:
- "8080:8080"
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.19 as BUILD
FROM eftechcombr/glpi:php-fpm-11.0.0 as BUILD
#

FROM nginxinc/nginx-unprivileged:1.27.5-alpine3.21-slim
Expand Down
3 changes: 3 additions & 0 deletions docker/nginx/conf.d/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ server {
include fastcgi_params;

fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;



}
}
4 changes: 3 additions & 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.19
ENV VERSION=11.0.0
ENV GLPI_LANG=en_US
ENV CACHE_DSN=redis://redis:6379/
ENV MARIADB_HOST=mariadb-glpi
Expand Down Expand Up @@ -43,5 +43,7 @@ RUN rm -rf /var/www/html/install/install.php

EXPOSE 9000/tcp

USER www-data

CMD ["php-fpm"]

4 changes: 2 additions & 2 deletions docker/php/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3.13-fpm-alpine3.20
FROM php:8.4.13-fpm-alpine3.22

COPY conf.d/*.ini $PHP_INI_DIR/conf.d/

Expand All @@ -8,7 +8,7 @@ RUN apk update \
&& apk add --no-cache \
icu-dev zlib-dev libpng-dev bzip2-dev libzip-dev openldap-dev \
&& docker-php-ext-install \
intl mysqli gd exif bz2 zip ldap opcache \
intl mysqli gd exif bz2 zip ldap opcache bcmath \
&& apk add --no-cache pcre-dev ${PHPIZE_DEPS} \
&& pecl install redis \
&& docker-php-ext-enable redis \
Expand Down
2 changes: 1 addition & 1 deletion docker/php/conf.d/99-glpi.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
memory_limit = 96M;
memory_limit = 256M;
file_uploads = on ;
max_execution_time = 600 ;
register_globals = off ;
Expand Down
4 changes: 2 additions & 2 deletions docker/php/scripts/glpi-db-install.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh

dbInstall () {

php bin/console db:install \
# Temporarily raise the limit for debugging
php -d memory_limit=256M bin/console db:install \
--default-language="$GLPI_LANG" \
--db-host="$MARIADB_HOST" \
--db-port="$MARIADB_PORT" \
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.19"
VERSION: "11.0.0"
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.19
- image: eftechcombr/glpi:php-fpm-11.0.0
imagePullPolicy: IfNotPresent
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.19
- image: eftechcombr/glpi:php-fpm-11.0.0
imagePullPolicy: IfNotPresent
name: php
envFrom:
Expand Down Expand Up @@ -67,7 +67,7 @@ spec:
app: nginx
spec:
containers:
- image: eftechcombr/glpi:nginx-10.0.19
- image: eftechcombr/glpi:nginx-11.0.0
imagePullPolicy: IfNotPresent
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.19
- image: eftechcombr/glpi:php-fpm-11.0.0
imagePullPolicy: IfNotPresent
name: base
envFrom:
Expand Down Expand Up @@ -54,7 +54,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.19
- image: eftechcombr/glpi:php-fpm-11.0.0
imagePullPolicy: IfNotPresent
name: base
command:
Expand Down Expand Up @@ -99,7 +99,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.19
- image: eftechcombr/glpi:php-fpm-11.0.0
imagePullPolicy: IfNotPresent
name: base
command:
Expand Down Expand Up @@ -144,7 +144,7 @@ spec:
template:
spec:
containers:
- image: eftechcombr/glpi:php-fpm-10.0.19
- image: eftechcombr/glpi:php-fpm-11.0.0
imagePullPolicy: IfNotPresent
name: base
command:
Expand Down