Nouvelle Correction de l'image pica-dokuwiki apres la reprise de l'audit

pica-dokuwiki/Dockerfile

-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

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
 

pica-dokuwiki/start.sh

+#!/bin/sh
+
+set -e
+
+chown -R www-data /var/www
+mkdir -p /var/run/php
+exec /usr/bin/supervisord -c /etc/supervisord.conf