diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile index d8e10dd718c5b1bd3f7c89ffeab741d35010c880..fdcd816ce6e46a1e8154c8bb53fa6998e22074ec 100644 --- a/pica-dokuwiki/Dockerfile +++ b/pica-dokuwiki/Dockerfile @@ -31,4 +31,4 @@ EXPOSE 80 VOLUME ["/var/www/html"] HEALTHCHECK CMD wget -q -O /dev/null http://127.0.0.1:${DOKUWIKI_PORT:=80}/ -CMD ["/run.sh"] +CMD ["/run.sh"] \ No newline at end of file diff --git a/pica-dokuwiki/docker-compose.yml b/pica-dokuwiki/docker-compose.yml index 6b9b09ce30a0f4768fc041606e3f4305c72f0e0b..7597f0449f7b8895e8096cf85d8c1d939975e791 100644 --- a/pica-dokuwiki/docker-compose.yml +++ b/pica-dokuwiki/docker-compose.yml @@ -1,6 +1,6 @@ version : "2.4" services: - dokuwiki-app: + wiki: container_name: wiki image: pica-dokuwiki:2018.05 volumes: @@ -14,5 +14,4 @@ services: - "traefik.frontend.rule=Host:wiki.picasoft.net" - "traefik.port=80" - "traefik.enable=true" - restart: always - + restart: always \ No newline at end of file diff --git a/pica-dokuwiki/run.sh b/pica-dokuwiki/run.sh index 3b4ad57a85f986700350ddd51f377e363e808de2..5433076a73fedfab639a97447894eafb38e86b6e 100644 --- a/pica-dokuwiki/run.sh +++ b/pica-dokuwiki/run.sh @@ -7,7 +7,7 @@ set -m php-fpm7.0 & -nginx +nginx & pids=`jobs -p`