From: Blackeye <14815724-Blackstareye@users.noreply.gitlab.com>
Date: Tue, 21 Jan 2025 14:18:52 +0000 (+0000)
Subject: Merge branch 'fix_for_issue_21' into 'next-release'
X-Git-Url: https://git.p6c8.net/jirafeau_project.git/commitdiff_plain/refs/heads/next-release?ds=inline;hp=233f1f25a00926f0a74650856fd431357690ed2b

Merge branch 'fix_for_issue_21' into 'next-release'

fix for issue #21 and a docker_compose.yaml for testing

See merge request jirafeau/Jirafeau!13
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13564df..2ab4d40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@
 5. Follow the installation wizard, it should propose you the same data folder or even update automatically
 6. Check your `/lib/config.local.php` and compare it with the `/lib/config.original.php` to see if new configuration items are available. If a new item is missing in your `config.local.php`, this may trigger some errors as Jirafeau may expect to have them.
 
+## Version 4.6.x (not yet released)
+
+- ...
+
 ## Version 4.6.1
 
 - Removed the download button and the corresponding link for encrypted files from the admin interface
diff --git a/Dockerfile b/Dockerfile
index d4854a8..823c1dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,8 @@ RUN --mount=type=bind,source=.,target=/mnt \
     cp -r /mnt/* /www/ && \
     rm -rf /www/docker && \
     touch /www/lib/config.local.php && \
-    chown -R $(id -u lighttpd).$(id -g www-data) /www && \
+    chown -R $(id -u lighttpd):$(id -g www-data) /www && \
     chmod 770 /www
 
 CMD ["/run.sh"]
-EXPOSE 80
\ No newline at end of file
+EXPOSE 80
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..6b9c57b
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,12 @@
+services:
+  web:
+    build:
+      context: . # or ../Dockerfile if we put it in the ./docker folder
+    volumes:
+      - ./jirafeau_data:/data
+    environment:
+      - ADMIN_PASSWORD='p4ssw0rd'
+    
+    ports:
+      - 8080:80
+
diff --git a/lib/settings.php b/lib/settings.php
index f0f193e..cbdfaff 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -43,7 +43,7 @@ if ($cfg['debug'] === true) {
 
 /* Jirafeau package */
 define('JIRAFEAU_PACKAGE', 'Jirafeau');
-define('JIRAFEAU_VERSION', '4.6.1');
+define('JIRAFEAU_VERSION', '4.6.x-dev');
 
 define('JIRAFEAU_WEBSITE', 'https://gitlab.com/jirafeau/Jirafeau');