From 29372084c890a41c8582f60c55468aff8c65fdcb Mon Sep 17 00:00:00 2001 From: eduardo Date: Tue, 2 Mar 2021 16:25:23 -0300 Subject: [PATCH] Update docker-compose files to 9.5.4 --- README.md | 24 ++++-------------------- docker/docker-compose-build.yml | 6 +++--- docker/docker-compose-nginx-build.yml | 6 +++--- docker/docker-compose-nginx.yml | 6 +++--- docker/docker-compose.yml | 8 ++++---- docker/nginx/Dockerfile | 4 ++-- docker/php/Dockerfile | 6 +++--- 7 files changed, 22 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 8d8f0e0..b82eed9 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ contato@fametec.com.br -e MARIADB_DATABASE=glpi \ -e MARIADB_USER=glpi \ -e MARIADB_PASSWORD=glpi \ - -e VERSION="9.5.1" \ + -e VERSION="9.5.4" \ -e PLUGINS="all" \ -p 80:80 \ -p 443:443 \ @@ -115,7 +115,7 @@ contato@fametec.com.br MARIADB_DATABASE: glpi MARIADB_USER: glpi-user MARIADB_PASSWORD: glpi-pass - VERSION: "9.5.1" + VERSION: "9.5.4" PLUGINS: "all" depends_on: - mariadb-glpi @@ -162,22 +162,6 @@ contato@fametec.com.br -# Plugins available - - - [x] fields - - [x] costs - - [x] datainjection - - [x] formcreator - - [x] tag - - [x] genericobject - - [x] Mod - - [x] pdf - - [x] ocsinventoryng - - [x] tasklists - - [x] telegrambot - - [x] fusioninventory - - # Manual install This script will install the GLPI on Linux Server CentOS 7.6 Minimal. @@ -203,7 +187,7 @@ This script will install the GLPI on Linux Server CentOS 7.6 Minimal. Edit the script - VERSION="9.5.3" # GLPI Version to install, default=9.4.5 + VERSION="9.5.4" # GLPI Version to install, default=9.5.4 TIMEZONE=America/Fortaleza # Timezone default=Etc/UTC FQDN="glpi.fametec.com.br" # Virtualhost default=glpi.fametec.com.br ADMINEMAIL="suporte@fametec.com.br" # Admin e-mail @@ -225,7 +209,7 @@ After instalation the script save the credentials and variables in ''install_glp ==================================================== ## VARIAVEIS - VERSION=9.5.3 + VERSION=9.5.4 TIMEZONE=America/Fortaleza FQDN=glpi.fametec.com.br ADMINEMAIL=suporte@fametec.com.br diff --git a/docker/docker-compose-build.yml b/docker/docker-compose-build.yml index 92910a1..5210c94 100644 --- a/docker/docker-compose-build.yml +++ b/docker/docker-compose-build.yml @@ -5,7 +5,7 @@ services: # mariadb-glpi: build: mariadb/ - image: fametec/glpi:9.5.3-mariadb + image: fametec/glpi:9.5.4-mariadb restart: unless-stopped volumes: - mariadb-glpi-volume:/var/lib/mysql:rw @@ -23,7 +23,7 @@ services: # glpi: build: apache/ - image: fametec/glpi:9.5.3 + image: fametec/glpi:9.5.4 restart: unless-stopped # volumes: # - glpi-volume-files:/var/www/html/files:rw @@ -49,7 +49,7 @@ services: # crond: build: crond/ - image: fametec/glpi:9.5.3-crond + image: fametec/glpi:9.5.4-crond restart: unless-stopped depends_on: - glpi diff --git a/docker/docker-compose-nginx-build.yml b/docker/docker-compose-nginx-build.yml index e9a16a5..09a986d 100644 --- a/docker/docker-compose-nginx-build.yml +++ b/docker/docker-compose-nginx-build.yml @@ -1,7 +1,7 @@ version: "3.5" services: mariadb-glpi: - image: fametec/glpi:9.5.3-mariadb + image: fametec/glpi:9.5.4-mariadb restart: unless-stopped volumes: - mariadb-glpi-volume:/var/lib/mysql:rw @@ -18,7 +18,7 @@ services: # nginx: build: nginx/ - image: fametec/glpi:9.5.3-nginx + image: fametec/glpi:9.5.4-nginx restart: unless-stopped volumes: - glpi-volume-files:/usr/share/nginx/html/glpi/files:rw @@ -34,7 +34,7 @@ services: php-fpm: build: php/ - image: fametec/glpi:9.5.3-php-fpm + image: fametec/glpi:9.5.4-php-fpm restart: unless-stopped environment: MARIADB_HOST: mariadb-glpi diff --git a/docker/docker-compose-nginx.yml b/docker/docker-compose-nginx.yml index 1aef002..347e214 100644 --- a/docker/docker-compose-nginx.yml +++ b/docker/docker-compose-nginx.yml @@ -1,7 +1,7 @@ version: "3.3" services: mariadb-glpi: - image: fametec/glpi:9.5.3-mariadb + image: fametec/glpi:9.5.4-mariadb restart: unless-stopped volumes: - mariadb-glpi-volume:/var/lib/mysql:rw @@ -17,7 +17,7 @@ services: # # glpi: - image: fametec/glpi:9.5.3-nginx + image: fametec/glpi:9.5.4-nginx restart: unless-stopped volumes: - glpi-volume-files:/usr/share/nginx/html/glpi/files:rw @@ -32,7 +32,7 @@ services: - glpi-backend php-fpm: - image: fametec/glpi:9.5.3-php-fpm + image: fametec/glpi:9.5.4-php-fpm restart: unless-stopped volumes: - glpi-volume-files:/usr/share/nginx/html/glpi/files:rw diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b04edc9..98c278e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.3" services: mariadb-glpi: - image: fametec/glpi:9.5.3-mariadb + image: fametec/glpi:9.5.4-mariadb restart: unless-stopped volumes: - mariadb-glpi-volume:/var/lib/mysql:rw @@ -17,7 +17,7 @@ services: # # glpi: - image: fametec/glpi:9.5.3 + image: fametec/glpi:9.5.4 restart: unless-stopped volumes: - glpi-volume-files:/var/www/html/files:rw @@ -29,7 +29,7 @@ services: MARIADB_DATABASE: glpi MARIADB_USER: glpi-user MARIADB_PASSWORD: glpi-pass - VERSION: "9.5.3" + VERSION: "9.5.4" PLUGINS: "all" depends_on: - mariadb-glpi @@ -43,7 +43,7 @@ services: # CRON # # crond: -# image: fametec/glpi:9.5.3-crond +# image: fametec/glpi:9.5.4-crond # restart: unless-stopped # depends_on: # - mariadb-glpi diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index bf356b1..770d06d 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,10 +1,10 @@ -FROM fametec/glpi:9.5.3-php-fpm as PHP +FROM fametec/glpi:9.5.4-php-fpm as PHP FROM nginx:alpine MAINTAINER eduardo@fametec.com.br -ENV VERSION 9.5.3 +ENV VERSION 9.5.4 WORKDIR /usr/share/nginx/html diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 10b3abb..2ab3567 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -10,7 +10,7 @@ ENV MARIADB_USER glpi ENV MARIADB_PASSWORD glpi -ENV VERSION 9.5.3 +ENV VERSION 9.5.4 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" @@ -54,9 +54,9 @@ WORKDIR /usr/share/nginx/html/glpi/ # COPY --chown=www-data:www-data src/glpi /usr/share/nginx/html/glpi -ADD https://github.com/glpi-project/glpi/releases/download/9.5.3/glpi-9.5.3.tgz /usr/share/nginx/html/ +ADD https://github.com/glpi-project/glpi/releases/download/9.5.4/glpi-9.5.4.tgz /usr/share/nginx/html/ # -RUN tar -zxf /usr/share/nginx/html/glpi-9.5.3.tgz -C /usr/share/nginx/html/ \ +RUN tar -zxf /usr/share/nginx/html/glpi-9.5.4.tgz -C /usr/share/nginx/html/ \ && chown -R www-data:www-data /usr/share/nginx/html/glpi COPY scripts/glpi-entrypoint.sh /