From 443f93c4b9d6e6178ca36fc05a37154315d737e4 Mon Sep 17 00:00:00 2001
From: Stanley Ragava <stanley.ragava@etu.utc.fr>
Date: Fri, 23 Nov 2018 00:57:16 +0100
Subject: [PATCH] =?UTF-8?q?nouvelles=20corrections=20apport=C3=A9es=20?=
=?UTF-8?q?=C3=A0=20l'image=20pica-docuwiki?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pica-dokuwiki/Dockerfile | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 7a88705c..94f78146 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -1,31 +1,39 @@
FROM nginx
LABEL maintainer="antoine@barbare.me"
-RUN apt-get update -y
-RUN apt-get install -y \
+WORKDIR /var/www
+RUN apt-get update -y \
+ apt-get install -y \
curl \
tar \
php7.0 \
php7.0-fpm \
php7.0-gd \
- php7.0-xml
+ php7.0-xml; \
+ mkdir -p html; \
+ chown -R nginx:nginx /var/www/html
+
USER nginx
COPY nginx.conf /etc/nginx/nginx.conf
-RUN 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 && \
- sed -i -e "s|listen\s*=\s*127\.0\.0\.1:9000|listen = /var/run/php-fpm7.sock|g" /etc/php/7.0/fpm/pool.d/www.conf && \
- 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 && \
-
-
-WORKDIR /usr/share/nginx
-RUN curl -O -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
+RUN 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; \
+ sed -i -e "s|listen\s*=\s*127\.0\.0\.1:9000|listen = /var/run/php-fpm7.sock|g" /etc/php/7.0/fpm/pool.d/www.conf; \
+ 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; \
+ curl -O -L "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
tar -xzf dokuwiki-stable.tgz -C html --strip-components 1 && \
rm -Rf dokuwiki*
+USER root
+RUN apt-get remove -y tar && \
+ apt-get -y autoclean && \
+ apt-get -y clean && \
+ apt-get -y autoremove
+
+USER nginx
EXPOSE 80
VOLUME ["/var/www/html"]
HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
@@ -33,11 +41,6 @@ HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
-USER root
-RUN apt-get remove -y \
- curl \
- tar
-
COPY run.sh /run.sh
CMD ["run.sh"]
--
GitLab