From d09ca6f3da0c621820dc3f8374d12bdf65a6f461 Mon Sep 17 00:00:00 2001
From: TuxGasy <garcia@soamichel.fr>
Date: Wed, 26 Jul 2017 11:41:12 +0200
Subject: [PATCH] Move all docker files into build/docker

---
 .dockerignore                                 | 16 --------------
 build/docker/.dockerignore                    |  3 +++
 Dockerfile => build/docker/Dockerfile         |  0
 build/docker/README.md                        | 21 +++++++++++++++++++
 .../docker/docker-compose.yml                 | 10 +--------
 docker-run.sh => build/docker/docker-run.sh   |  0
 6 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 .dockerignore
 create mode 100644 build/docker/.dockerignore
 rename Dockerfile => build/docker/Dockerfile (100%)
 create mode 100644 build/docker/README.md
 rename docker-compose.yml => build/docker/docker-compose.yml (59%)
 rename docker-run.sh => build/docker/docker-run.sh (100%)

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index e5908c26ac0..00000000000
--- a/.dockerignore
+++ /dev/null
@@ -1,16 +0,0 @@
-build
-build.xml
-ChangeLog
-composer.json
-CONTRIBUTING.md
-COPYING
-COPYRIGHT
-dev
-doc
-Dockerfile
-INSTALL
-README-FR.md
-README.md
-robots.txt
-scripts
-test
\ No newline at end of file
diff --git a/build/docker/.dockerignore b/build/docker/.dockerignore
new file mode 100644
index 00000000000..e345920fb8c
--- /dev/null
+++ b/build/docker/.dockerignore
@@ -0,0 +1,3 @@
+Dockerfile
+README.md
+docker-compose.yml
diff --git a/Dockerfile b/build/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to build/docker/Dockerfile
diff --git a/build/docker/README.md b/build/docker/README.md
new file mode 100644
index 00000000000..113c03d21b5
--- /dev/null
+++ b/build/docker/README.md
@@ -0,0 +1,21 @@
+# How to use it ?
+
+The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
+
+Before build/run, define the variable HOST_USER_ID as following:
+
+        export HOST_USER_ID=$(id -u)
+
+And then, you can run :
+
+        docker-compose up
+
+This will run 3 container Docker : Dolibarr, MariaDB and PhpMyAdmin.
+
+The URL to go to the Dolibarr is :
+
+        http://0.0.0.0
+
+The URL to go to PhpMyAdmin is (login/password is root/root) :
+
+        http://0.0.0.0:8080
diff --git a/docker-compose.yml b/build/docker/docker-compose.yml
similarity index 59%
rename from docker-compose.yml
rename to build/docker/docker-compose.yml
index 2f0b5536d4f..a2017335197 100644
--- a/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -1,11 +1,3 @@
-# This docker-compose.yml file is used to build and run Dolibarr
-# in the current workspace
-#
-# Before build/run, define the variable HOST_USER_ID as following:
-# $ export HOST_USER_ID=$(id -u)
-# And then, you can run :
-# $ docker-compose up
-
 mariadb:
     image: mariadb:latest
     environment:
@@ -26,7 +18,7 @@ web:
     environment:
         HOST_USER_ID: $HOST_USER_ID
     volumes:
-        - ./htdocs:/var/www/html
+        - ../../htdocs:/var/www/html
     links:
         - mariadb
     ports:
diff --git a/docker-run.sh b/build/docker/docker-run.sh
similarity index 100%
rename from docker-run.sh
rename to build/docker/docker-run.sh