From b0de1634e7be5182283a7ec39785f6657c0927b8 Mon Sep 17 00:00:00 2001
From: Igor WITZ <igor.witz@etu.utc.fr>
Date: Wed, 28 Nov 2018 18:52:49 +0100
Subject: [PATCH] Nettoyage
---
pica-dokuwiki/Dockerfile | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index 33b8000f..a84f6910 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -1,7 +1,8 @@
FROM nginx
LABEL maintainer="antoine@barbare.me"
-COPY nginx.conf /etc/nginx/nginx.conf
+COPY --chown=www-data nginx.conf /etc/nginx/nginx.conf
+COPY --chown=www-data run.sh /
WORKDIR /var/www
RUN apt-get update -y && \
@@ -22,17 +23,12 @@ RUN apt-get update -y && \
wget "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 . /etc/nginx/nginx.conf && \
- sed -i "s/\${MAXSIZE}/100M/g" /etc/nginx/nginx.conf && \
- ln -sf /dev/stdout /var/log/nginx/access.log && \
- ln -sf /dev/stderr /var/log/nginx/error.log && \
- ln -sf /dev/stderr /var/log/php-fpm.log
-
+ chown -R www-data . && \
+ chmod +x /run.sh && \
+ sed -i "s/\${MAXSIZE}/100M/g" /etc/nginx/nginx.conf
+
EXPOSE 80
VOLUME ["/var/www/html"]
HEALTHCHECK CMD wget -q -O /dev/null http://127.0.0.1:${DOKUWIKI_PORT:=80}/
-COPY run.sh /
-COPY entrypoint.sh /
-
-ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/run.sh"]
--
GitLab