From 342f841432e315541a779587f80167443f12c5e8 Mon Sep 17 00:00:00 2001
From: Stanley Ragava <stanley.ragava@etu.utc.fr>
Date: Tue, 13 Nov 2018 23:29:19 +0100
Subject: [PATCH] Nouvelle Correction de l'image pica-dokuwiki apres la reprise
de l'audit
---
pica-dokuwiki/Dockerfile | 33 +++++++++++++++++++++++++++-----
pica-dokuwiki/docker-compose.yml | 1 -
pica-dokuwiki/start.sh | 7 +++++++
3 files changed, 35 insertions(+), 6 deletions(-)
create mode 100755 pica-dokuwiki/start.sh
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index daf4d077..ae5e13b6 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -1,16 +1,39 @@
-FROM registry.picasoft.net:5000/pica-nginx
+FROM nginx
LABEL maintainer="antoine@barbare.me"
-RUN cd /var/www && \
- 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*
+RUN apt-get update -y
+RUN apt-get install -y \
+ curl \
+ tar \
+ php7.0 \
+ php7.0-fpm \
+ php7.0-gd \
+ php7.0-xml
COPY nginx.conf /etc/nginx/nginx.conf
+COPY supervisord.conf /etc/supervisord.conf
COPY entrypoint.sh /entrypoint.sh
+COPY start.sh /start.sh
+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 && \
+ chmod +x /start.sh
+
+RUN cd /usr/share/nginx && \
+ 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 nginx
EXPOSE 80
VOLUME ["/var/www/html"]
HEALTHCHECK CMD curl -s 127.0.0.1:${DOKUWIKI_PORT:=80}
ENTRYPOINT ["/entrypoint.sh"]
+
+USER root
+CMD /start.sh
diff --git a/pica-dokuwiki/docker-compose.yml b/pica-dokuwiki/docker-compose.yml
index 7f50b7f1..38cc770d 100644
--- a/pica-dokuwiki/docker-compose.yml
+++ b/pica-dokuwiki/docker-compose.yml
@@ -14,6 +14,5 @@
- "traefik.frontend.rule=Host:wiki.picasoft.net"
- "traefik.port=80"
- "traefik.enable=true"
- env_file: ./wiki.secrets
restart: always
diff --git a/pica-dokuwiki/start.sh b/pica-dokuwiki/start.sh
new file mode 100755
index 00000000..45b1bfc1
--- /dev/null
+++ b/pica-dokuwiki/start.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+chown -R www-data /var/www
+mkdir -p /var/run/php
+exec /usr/bin/supervisord -c /etc/supervisord.conf
--
GitLab