From 4126c5a42a8059096956dc8bedcd5e55f03fb514 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Fri, 4 Sep 2020 17:40:04 +0200
Subject: [PATCH] Fix port mapping of Dokuwiki and keep wget for HEALTHCHECK
(Dokuwiki)
---
pica-dokuwiki/Dockerfile | 3 +--
pica-uploads/docker-compose.yml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 150d3118..4a8eaadd 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -34,7 +34,6 @@ RUN apt-get update -y && \
chown -R www-data . && \
chmod +x /run.sh && \
sed -i "s/\${MAXSIZE}/100M/g" /etc/nginx/nginx.conf && \
- apt-get remove -y wget && \
apt-get autoremove -y && \
apt-get clean
@@ -45,6 +44,6 @@ ENV LANGUAGE fr_FR.UTF-8
EXPOSE 80
VOLUME ["/var/www/html"]
-HEALTHCHECK CMD wget -q -O /dev/null http://127.0.0.1:${DOKUWIKI_PORT:=80}/
+HEALTHCHECK CMD curl http://127.0.0.1:${DOKUWIKI_PORT:=80}/
CMD ["/run.sh"]
diff --git a/pica-uploads/docker-compose.yml b/pica-uploads/docker-compose.yml
index b88b6c85..6c33d43f 100644
--- a/pica-uploads/docker-compose.yml
+++ b/pica-uploads/docker-compose.yml
@@ -17,7 +17,7 @@ services:
- uploads:/home/pica/uploads
- ./secrets/sftp.secrets:/etc/sftp/users.conf:ro
ports:
- - 2222:22
+ - "2222:22"
networks:
- sftp
restart: unless-stopped
--
GitLab