Merge branch 'hotfix_issue_21' into 'master'

HOTFIX: fix for issue #21 and a docker_compose.yaml for testing | cherry https://gitlab.com/jirafeau/Jirafeau/-/commit/8e36d013510ddedf9bb830b547f2de7664815bd0

See merge request jirafeau/Jirafeau!20

diff --git a/Dockerfile b/Dockerfile
index d4854a8fcbdf4e01f330a041f1f4577d0feb83e9..823c1dd37c4d8a7f2ea60e4b0905225751af4d15 100644 (file)
--- 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 (file)
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
+