Merge pull request #10 from Comrade3/master

Update to v1.24.1 & Language option
grocy · Jan 18, 2019 · 4d30822 · 4d30822
2 parents 6f4c5dc + 16559ad
commit 4d30822
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile-grocy b/Dockerfile-grocy
@@ -1,8 +1,8 @@
 FROM php:7.2-fpm-alpine
 MAINTAINER Talmai Oliveira <to@talm.ai>
 
-ENV REFRESHED_AT  2018-11-15
-ENV GROCY_VERSION 1.22.0
+ENV REFRESHED_AT  2019-1-16
+ENV GROCY_VERSION 1.24.1
 
 RUN	apk update && \
 	apk upgrade && \
@@ -29,7 +29,6 @@ RUN	apk update && \
 	rm -f grocy.zip && \
 	cd grocy-${GROCY_VERSION} && \
 	mv public /www/public && \
-	mv info.php /www/public && \
 	mv controllers /www/controllers && \
 	mv data /www/data && \
 	mv helpers /www/helpers && \
@@ -65,4 +64,4 @@ WORKDIR /www/public
 VOLUME ["/www"]
 
 # Expose ports
-EXPOSE 9000
+EXPOSE 9000
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,6 +31,7 @@ services:
       MAX_UPLOAD:          50M
       PHP_MAX_FILE_UPLOAD: 200
       PHP_MAX_POST:        100M
+      GROCY_CULTURE: en
     container_name: grocy
 volumes:
   database: