Merge branch 'next-release'

diff --combined docker-compose.yaml
index 6b9c57b7249746a0e060e93c4d608a00b2d83e75,9fcb63546f413bfec175de310e1077047dadbb04..2de68f8e19f9e1aa5bb6338a8e860c053cb8e9ad
--- 1/docker-compose.yaml
--- 2/docker-compose.yaml
+++ b/docker-compose.yaml
@@@ -1,12 -1,30 +1,31 @@@
  services:
    web:
      build:
+       no_cache: true
+       #args:
+         # INI: php_debug #change the ini
        context: . # or ../Dockerfile if we put it in the ./docker folder
      volumes:
        - ./jirafeau_data:/data
      environment:
-       - ADMIN_PASSWORD='p4ssw0rd'
-     
+       ADMIN_PASSWORD: p4ssw0rd
+       #LANG: en
+       #WEB_ROOT: 'my.domain.de'
+       #STYLE: 'my_jirafeau_theme'
+       #DARK_STYLE: 'my_jirafeau_theme'
+       AVAILABILITIES: |
+         {
+           "minute": true,
+           "hour": true,
+           "day": true,
+           "week": true,
+           "fortnight": true,
+           "month": true,
+           "quarter": false,
+           "year": false,
+           "none": false
+         }
      ports:
        - 8080:80
  
++