From 57862cc1c0eaeb62eee5338ca92ccc431d0d3454 Mon Sep 17 00:00:00 2001
From: Stanley Ragava <stanley.ragava@etu.utc.fr>
Date: Thu, 8 Nov 2018 00:48:04 +0100
Subject: [PATCH] patch of detected vulnerabilities
---
pica-dokuwiki/Dockerfile | 3 ++-
pica-dokuwiki/docker-compose.yml | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 pica-dokuwiki/docker-compose.yml
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 143379a9..daf4d077 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -1,5 +1,5 @@
FROM registry.picasoft.net:5000/pica-nginx
-MAINTAINER antoine@barbare.me
+LABEL maintainer="antoine@barbare.me"
RUN cd /var/www && \
curl -O -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
@@ -11,5 +11,6 @@ COPY entrypoint.sh /entrypoint.sh
EXPOSE 80
VOLUME ["/var/www/html"]
+HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
ENTRYPOINT ["/entrypoint.sh"]
diff --git a/pica-dokuwiki/docker-compose.yml b/pica-dokuwiki/docker-compose.yml
new file mode 100644
index 00000000..7f50b7f1
--- /dev/null
+++ b/pica-dokuwiki/docker-compose.yml
@@ -0,0 +1,19 @@
+ wiki:
+ container_name: wiki
+ image: registry.picasoft.net:5000/pica-dokuwiki:2018.05
+ volumes:
+ - /DATA/docker/wiki/html:/var/www/html
+ environment:
+ - MAX_UPLOAD_SIZE=100M
+ security_opt:
+ - no-new-privileges
+ mem_limit: 2048m
+ cpus: "0.20"
+ pids_limit: 1024
+ labels:
+ - "traefik.frontend.rule=Host:wiki.picasoft.net"
+ - "traefik.port=80"
+ - "traefik.enable=true"
+ env_file: ./wiki.secrets
+ restart: always
+
--
GitLab