From 027bd8a4cd90c2238cb31987ec0f688705f0bdfc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 29 Mar 2020 14:06:55 +0200 Subject: [PATCH] :arrow_up: Upgrades Grocy to 2.6.1 --- grocy/Dockerfile | 2 +- grocy/rootfs/etc/php7/php-fpm.d/ingress.conf | 1 + grocy/rootfs/etc/php7/php-fpm.d/www.conf | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/grocy/Dockerfile b/grocy/Dockerfile index c094ed6..ff71c67 100755 --- a/grocy/Dockerfile +++ b/grocy/Dockerfile @@ -29,7 +29,7 @@ RUN \ \ && yarn global add modclean \ \ - && git clone --branch "v2.6.0" --depth=1 \ + && git clone --branch "v2.6.1" --depth=1 \ https://github.com/grocy/grocy.git /var/www/grocy \ \ && cd /var/www/grocy \ diff --git a/grocy/rootfs/etc/php7/php-fpm.d/ingress.conf b/grocy/rootfs/etc/php7/php-fpm.d/ingress.conf index 0a2c355..ce1aecf 100644 --- a/grocy/rootfs/etc/php7/php-fpm.d/ingress.conf +++ b/grocy/rootfs/etc/php7/php-fpm.d/ingress.conf @@ -9,4 +9,5 @@ pm.min_spare_servers = 2 pm.max_spare_servers = 5 pm.max_requests = 1024 clear_env = no +env[GROCY_BASE_PATH] = '/' env[GROCY_BASE_URL] = '%%ingress_entry%%' diff --git a/grocy/rootfs/etc/php7/php-fpm.d/www.conf b/grocy/rootfs/etc/php7/php-fpm.d/www.conf index b17758f..a587fe9 100644 --- a/grocy/rootfs/etc/php7/php-fpm.d/www.conf +++ b/grocy/rootfs/etc/php7/php-fpm.d/www.conf @@ -9,3 +9,4 @@ pm.min_spare_servers = 2 pm.max_spare_servers = 5 pm.max_requests = 1024 clear_env = no +env[GROCY_BASE_PATH] = '/'