From 0f8e61b79e2d6d48d6b06e23bbddd4a6ed413b38 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Thu, 30 Jan 2020 00:33:26 +0100
Subject: [PATCH] [Dokuwiki] Extract new version in another folder
---
docker_test.sh | 3 ++-
pica-dokuwiki/Dockerfile | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker_test.sh b/docker_test.sh
index c8b17fa2..ad4c7a6f 100755
--- a/docker_test.sh
+++ b/docker_test.sh
@@ -50,7 +50,8 @@ fi
echo -e "\n==== Remove and re-create named external volumes ===="
for v in $(docker-compose config --volumes); do
- docker volume rm "$v"
+ # Don't fail if volume does not exists
+ docker volume rm "$v" || true
docker volume create "$v"
done
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index b2b59e88..0249d342 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -22,7 +22,8 @@ RUN apt-get update -y && \
sed -i -e "s|;listen\.group\s*=\s*|listen.group = |g" /etc/php/7.3/fpm/pool.d/www.conf && \
sed -i -e "s|;listen\.mode\s*=\s*|listen.mode = |g" /etc/php/7.3/fpm/pool.d/www.conf && \
wget -O dokuwiki.tgz "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
- tar -xzf dokuwiki.tgz -C html --strip-components 1 && \
+ mkdir update && \
+ tar -xzf dokuwiki.tgz -C update --strip-components 1 && \
rm -f dokuwiki.tgz && \
chown -R www-data . && \
chmod +x /run.sh && \
--
GitLab