From 257aa60a9fb4738488b0d45f384853bf23268c21 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Mon, 16 Jan 2017 14:17:34 +0100
Subject: [PATCH] [Misc] Since we may want to generate different images of
xwiki in the future (with different dbs, different servlet containers, etc),
move all current data into a xwiki-mysql-tomcat directory.
---
README.md | 1 +
.env => xwiki-mysql-tomcat/.env | 0
Dockerfile => xwiki-mysql-tomcat/Dockerfile | 0
docker-compose.yml => xwiki-mysql-tomcat/docker-compose.yml | 0
{mysql => xwiki-mysql-tomcat/mysql}/xwiki.cnf | 0
{tomcat => xwiki-mysql-tomcat/tomcat}/setenv.sh | 0
{xwiki => xwiki-mysql-tomcat/xwiki}/hibernate.cfg.xml | 0
{xwiki => xwiki-mysql-tomcat/xwiki}/start_xwiki.sh | 0
{xwiki => xwiki-mysql-tomcat/xwiki}/xwiki-config-replace.sh | 0
{xwiki => xwiki-mysql-tomcat/xwiki}/xwiki-set-cfg | 0
{xwiki => xwiki-mysql-tomcat/xwiki}/xwiki-set-properties | 0
11 files changed, 1 insertion(+)
rename .env => xwiki-mysql-tomcat/.env (100%)
rename Dockerfile => xwiki-mysql-tomcat/Dockerfile (100%)
rename docker-compose.yml => xwiki-mysql-tomcat/docker-compose.yml (100%)
rename {mysql => xwiki-mysql-tomcat/mysql}/xwiki.cnf (100%)
rename {tomcat => xwiki-mysql-tomcat/tomcat}/setenv.sh (100%)
rename {xwiki => xwiki-mysql-tomcat/xwiki}/hibernate.cfg.xml (100%)
rename {xwiki => xwiki-mysql-tomcat/xwiki}/start_xwiki.sh (100%)
rename {xwiki => xwiki-mysql-tomcat/xwiki}/xwiki-config-replace.sh (100%)
rename {xwiki => xwiki-mysql-tomcat/xwiki}/xwiki-set-cfg (100%)
rename {xwiki => xwiki-mysql-tomcat/xwiki}/xwiki-set-properties (100%)
diff --git a/README.md b/README.md
index aef4b3c..e369c84 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Usage
* Install Docker on your machine
* Install Git and run `git clone https://github.com/xwiki-contrib/docker-xwiki.git` or download the content of https://github.com/xwiki-contrib/docker-xwiki
+* Go to the `xwiki-mysql-tomcat` directory: `cd xwiki-mysql-tomcat`
* Run `docker-compose up`
Details
diff --git a/.env b/xwiki-mysql-tomcat/.env
similarity index 100%
rename from .env
rename to xwiki-mysql-tomcat/.env
diff --git a/Dockerfile b/xwiki-mysql-tomcat/Dockerfile
similarity index 100%
rename from Dockerfile
rename to xwiki-mysql-tomcat/Dockerfile
diff --git a/docker-compose.yml b/xwiki-mysql-tomcat/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to xwiki-mysql-tomcat/docker-compose.yml
diff --git a/mysql/xwiki.cnf b/xwiki-mysql-tomcat/mysql/xwiki.cnf
similarity index 100%
rename from mysql/xwiki.cnf
rename to xwiki-mysql-tomcat/mysql/xwiki.cnf
diff --git a/tomcat/setenv.sh b/xwiki-mysql-tomcat/tomcat/setenv.sh
similarity index 100%
rename from tomcat/setenv.sh
rename to xwiki-mysql-tomcat/tomcat/setenv.sh
diff --git a/xwiki/hibernate.cfg.xml b/xwiki-mysql-tomcat/xwiki/hibernate.cfg.xml
similarity index 100%
rename from xwiki/hibernate.cfg.xml
rename to xwiki-mysql-tomcat/xwiki/hibernate.cfg.xml
diff --git a/xwiki/start_xwiki.sh b/xwiki-mysql-tomcat/xwiki/start_xwiki.sh
similarity index 100%
rename from xwiki/start_xwiki.sh
rename to xwiki-mysql-tomcat/xwiki/start_xwiki.sh
diff --git a/xwiki/xwiki-config-replace.sh b/xwiki-mysql-tomcat/xwiki/xwiki-config-replace.sh
similarity index 100%
rename from xwiki/xwiki-config-replace.sh
rename to xwiki-mysql-tomcat/xwiki/xwiki-config-replace.sh
diff --git a/xwiki/xwiki-set-cfg b/xwiki-mysql-tomcat/xwiki/xwiki-set-cfg
similarity index 100%
rename from xwiki/xwiki-set-cfg
rename to xwiki-mysql-tomcat/xwiki/xwiki-set-cfg
diff --git a/xwiki/xwiki-set-properties b/xwiki-mysql-tomcat/xwiki/xwiki-set-properties
similarity index 100%
rename from xwiki/xwiki-set-properties
rename to xwiki-mysql-tomcat/xwiki/xwiki-set-properties
--
GitLab