From 564374b093be2692664c400fc9330365fcc570c7 Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Wed, 28 Nov 2018 23:47:37 +0100
Subject: [PATCH] Update pica-dokuwiki/Dockerfile
---
pica-dokuwiki/Dockerfile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index e36fd2f4..f8f6cb88 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -7,13 +7,12 @@ COPY --chown=www-data run.sh /
WORKDIR /var/www
RUN apt-get update -y && \
apt-get install -y \
- wget \
+ curl \
tar \
php7.0 \
php7.0-fpm \
php7.0-gd \
- php7.0-xml \
- libidn2-0 && \
+ php7.0-xml && \
mkdir -p html /var/run/php && \
echo "cgi.fix_pathinfo = 0;" >> /etc/php/7.0/fpm/php.ini && \
sed -i -e "s|;daemonize\s*=\s*yes|daemonize = no|g" /etc/php/7.0/fpm/php-fpm.conf && \
@@ -21,7 +20,7 @@ RUN apt-get update -y && \
sed -i -e "s|;listen\.owner\s*=\s*|listen.owner = |g" /etc/php/7.0/fpm/pool.d/www.conf && \
sed -i -e "s|;listen\.group\s*=\s*|listen.group = |g" /etc/php/7.0/fpm/pool.d/www.conf && \
sed -i -e "s|;listen\.mode\s*=\s*|listen.mode = |g" /etc/php/7.0/fpm/pool.d/www.conf && \
- wget "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
+ curl -O -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
tar -xzf dokuwiki-stable.tgz -C html --strip-components 1 && \
rm -f dokuwiki-stable.tgz && \
chown -R www-data . && \
@@ -30,6 +29,6 @@ RUN apt-get update -y && \
EXPOSE 80
VOLUME ["/var/www/html"]
-HEALTHCHECK CMD wget -q -O /dev/null http://127.0.0.1:${DOKUWIKI_PORT:=80}/
+HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
CMD ["/run.sh"]
--
GitLab