From 92aae8d7c67abcf77b0191e6d8fa01ffd336ee1c Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Mon, 17 Dec 2018 18:54:30 +0100
Subject: [PATCH] Update pica-dokuwiki/Dockerfile,
pica-dokuwiki/docker-compose.yml, pica-dokuwiki/run.sh files
---
pica-dokuwiki/Dockerfile | 2 +-
pica-dokuwiki/docker-compose.yml | 5 ++---
pica-dokuwiki/run.sh | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index d8e10dd7..fdcd816c 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 6b9b09ce..7597f044 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 3b4ad57a..5433076a 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`
--
GitLab