From 8e83494ce738f8a75e551376a784e9d1f7eb9745 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Fri, 21 Apr 2017 10:43:03 +0200
Subject: [PATCH] XDOCKER-21: Move the .first_start_completed file outside of
 the xwiki volume

---
 8/mysql-tomcat/xwiki/docker-entrypoint.sh    | 4 ++--
 8/postgres-tomcat/xwiki/docker-entrypoint.sh | 4 ++--
 9/mysql-tomcat/xwiki/docker-entrypoint.sh    | 4 ++--
 9/postgres-tomcat/xwiki/docker-entrypoint.sh | 4 ++--
 template/xwiki/docker-entrypoint.sh          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/8/mysql-tomcat/xwiki/docker-entrypoint.sh b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
index 753c104..b56ca7d 100755
--- a/8/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/8/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/8/postgres-tomcat/xwiki/docker-entrypoint.sh b/8/postgres-tomcat/xwiki/docker-entrypoint.sh
index 753c104..b56ca7d 100755
--- a/8/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/8/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/9/mysql-tomcat/xwiki/docker-entrypoint.sh b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
index 753c104..b56ca7d 100755
--- a/9/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/9/postgres-tomcat/xwiki/docker-entrypoint.sh b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
index 753c104..b56ca7d 100755
--- a/9/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/9/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # $1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
diff --git a/template/xwiki/docker-entrypoint.sh b/template/xwiki/docker-entrypoint.sh
index 2eb18ce..b837135 100755
--- a/template/xwiki/docker-entrypoint.sh
+++ b/template/xwiki/docker-entrypoint.sh
@@ -23,7 +23,7 @@ set -e
 
 function first_start() {
   configure
-  touch /usr/local/xwiki/.first_start_completed
+  touch /usr/local/tomcat/webapps/ROOT/.first_start_completed
 }
 
 # \$1 - the path to xwiki.[cfg|properties]
@@ -74,7 +74,7 @@ fi
 
 # Check for the expected command
 if [ "\$1" = 'xwiki' ]; then
-  if [[ ! -f /usr/local/xwiki/.first_start_completed ]]; then
+  if [[ ! -f /usr/local/tomcat/webapps/ROOT/.first_start_completed ]]; then
     first_start
   fi
   shift
-- 
GitLab