From 85b0c37974f6aaec9d1ea9a3d51a44b54f9e3d51 Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Mon, 16 Jan 2017 17:51:31 +0100
Subject: [PATCH] [Misc] Go back to the previous setup which was better and
I've found a way to make DockerHub happy with it.
---
README.md | 18 +++++++++++-------
.env => xwiki-mysql-tomcat/.env | 0
Dockerfile => xwiki-mysql-tomcat/Dockerfile | 0
.../docker-compose-using.yml | 0
.../docker-compose.yml | 0
{mysql => xwiki-mysql-tomcat/mysql}/xwiki.cnf | 0
.../tomcat}/setenv.sh | 0
.../xwiki}/hibernate.cfg.xml | 0
.../xwiki}/start_xwiki.sh | 0
.../xwiki}/xwiki-config-replace.sh | 0
.../xwiki}/xwiki-set-cfg | 0
.../xwiki}/xwiki-set-properties | 0
12 files changed, 11 insertions(+), 7 deletions(-)
rename .env => xwiki-mysql-tomcat/.env (100%)
rename Dockerfile => xwiki-mysql-tomcat/Dockerfile (100%)
rename docker-compose-using.yml => xwiki-mysql-tomcat/docker-compose-using.yml (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 762ff54..00aac68 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
-Provides a full Docker environment for XWiki made up of the following:
-* A Docker container running the latest MySQL 5.x database and configured to use UTF8 and be case-insensitive
-* A Docker container running the latest Tomcat 8 + Java 8 + XWiki (the version depends on the branch/tag you use)
+Provides several full Docker environments for running XWiki.
+
+The following configurations are currently supported:
+* Two Docker containers with one container for running latest MySQL 5.x database (configured to use UTF8 and be
+case-insensitive) and another container for running the latest Tomcat 8 + Java 8 + XWiki (the version depends on the
+branch/tag you use).
All source files are under the LGPL 2.1 license.
@@ -10,19 +13,20 @@ You should first install [Docker](https://www.docker.com/) on your machine.
Then there are several options:
-1. Get the [sources of this project](https://github.com/xwiki-contrib/xwiki-mysql-tomcat) and build them.
+1. Get the [sources of this project](https://github.com/xwiki-contrib/docker-xwiki) and build them.
2. Just pull the xwiki image from DockerHub.
## Building ##
This is the simplest solution and the one recommended. Here are the steps:
-* Install Git and run `git clone https://github.com/xwiki-contrib/xwiki-mysql-tomcat.git` or download the sources from
+* Install Git and run `git clone https://github.com/xwiki-contrib/docker-xwiki.git` or download the sources from
the GitHub UI. Then choose the branch or tag that you wish to use:
* The `master`branch will get you the latest released version of XWiki
* The `8.x` branch will get you the latest released version of XWiki for the 8.x cycle
* The `8.4.4` tag will get you exactly XWiki 8.4.4.
* etc.
+* Go the directory corresponding to the configuration you wish to build, for example: `cd xwiki-mysql-tomcat`.
* Run `docker-compose up`
* Start a browser and point it to `http://localhost:8080`
@@ -38,7 +42,7 @@ you can issue `docker-compose up --build`. You can also build the image with
This is a bit more complex since you need to have 2 docker containers running: one for XWiki and one for the database.
-Here's a minimal Docker Compose file that you could use as an example (full example
+Here's a minimal Docker Compose file using MySQL that you could use as an example (full example
[here](https://github.com/xwiki-contrib/xwiki-mysql-tomcat/blob/master/docker-compose-using.yml):
```
@@ -71,7 +75,7 @@ volumes:
xwiki-data: {}
```
-# Details
+# Details for xwiki-mysql-tomcat
Volumes:
* Two volumes are created:
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-using.yml b/xwiki-mysql-tomcat/docker-compose-using.yml
similarity index 100%
rename from docker-compose-using.yml
rename to xwiki-mysql-tomcat/docker-compose-using.yml
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