Merge branch 'traefik-v2' into 'master'

Migrate to Traefik v2

See merge request picasoft/projets/dockerfiles!53

pica-dokuwiki/Dockerfile

@@ -34,7 +34,6 @@ RUN apt-get update -y && \
     chown -R www-data . && \
     chmod +x /run.sh && \
     sed -i "s/\${MAXSIZE}/100M/g" /etc/nginx/nginx.conf && \
-    apt-get remove -y wget && \
     apt-get autoremove -y && \
     apt-get clean
 
@@ -45,6 +44,6 @@ ENV LANGUAGE fr_FR.UTF-8
 EXPOSE 80
 VOLUME ["/var/www/html"]
 
-HEALTHCHECK CMD wget -q -O /dev/null http://127.0.0.1:${DOKUWIKI_PORT:=80}/
+HEALTHCHECK CMD curl http://127.0.0.1:${DOKUWIKI_PORT:=80}/
 
 CMD ["/run.sh"]

pica-dokuwiki/docker-compose.yml

-version : "2.4"
+version : "3.7"
 
 volumes:
   dokuwiki-app:
     name: "dokuwiki-app"
 
 networks:
-  docker_default:
+  proxy:
     external: true
 
 services:
@@ -15,15 +15,11 @@ services:
     container_name: dokuwiki-app
     volumes:
       - dokuwiki-app:/var/www/html
-    security_opt:
-      - no-new-privileges
-    mem_limit: "2048m"
-    cpus: "0.20"
-    pids_limit: 1024
     labels:
-      - "traefik.frontend.rule=Host:wiki.picasoft.net"
-      - "traefik.port=80"
-      - "traefik.enable=true"
+      traefik.http.routers.dokuwiki-app.entrypoints: websecure
+      traefik.http.routers.dokuwiki-app.rule: Host(`wiki.picasoft.net`)
+      traefik.http.services.dokuwiki-app.loadbalancer.server.port: 80
+      traefik.enable: true
     restart: unless-stopped
     networks:
-      - docker_default
+      - proxy