Skip to content

Commit

Permalink
- up container VERSION
Browse files Browse the repository at this point in the history
- comment api links in nginx configuration
- change windows instalation script comments and container version
  • Loading branch information
Wolvverine committed May 20, 2024
1 parent 87f2fce commit 9bc4fd7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.1
3.8.2
20 changes: 13 additions & 7 deletions install scripts/install_upgrade_glpi_with_mariadb_docker.cmd
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
@ECHO OFF
REM GLPI Install Environment
REM names containers
REM GLPI Install Environment script

REM containers names:
SET GLPI_container=GLPI
SET DB_Container=MariaDB

REM GLPI Docker repository and dockerhub tags
SET docker_repository=wolvverine/docker-glpi
SET docker_tag=nginx-82-10.0.14-3.8.1
SET docker_tag=nginx-82-10.0.14-3.8.2

REM aktualne tagi dla kontenera GLPI
REM www_server-php_version-glpi_version-container_version
REM nginx-82-10.0.14-3.8
REM nginx-82-xdebug-10.0.14-3.8
REM current tags for the GLPI container
REM https://hub.docker.com/r/wolvverine/docker-glpi/tags
REM Example:
REM www_server-php_version-glpi_version-container_version
REM nginx-82-10.0.14-3.8.2
REM nginx-82-xdebug-10.0.14-3.8.2
REM nginx-82-10.0.14-3.8.2-develop
REM nginx-82-xdebug-10.0.14-3.8.2-develop


REM Database Docker repository and dockerhub tags
SET docker_DB_repository=mariadb
Expand Down
20 changes: 10 additions & 10 deletions root/etc/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,16 @@ http {
return 301 $scheme://$host/marketplace/glpiinventory/;
}

location = /api/ {
# if ($http_x_forwarded_proto ~ "^https?$") {
# return 301 $http_x_forwarded_proto://$host/apirest.php;
# }
return 301 $scheme://$host/apirest.php;
}

location /api {
rewrite ^/api/(.*)$ /apirest.php/$1 last;
}
# location = /api/ {
# # if ($http_x_forwarded_proto ~ "^https?$") {
# # return 301 $http_x_forwarded_proto://$host/apirest.php;
# # }
# return 301 $scheme://$host/apirest.php;
# }
# location /api {
# rewrite ^/api/(.*)$ /apirest.php/$1 last;
# }

location = /nginx-status {
allow 127.0.0.1;
Expand Down

0 comments on commit 9bc4fd7

Please sign in to comment.