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 72%
rename from Dockerfile
rename to build/docker/Dockerfile
index 00a5d0ef567..caa7b0c436a 100644
--- a/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,4 +1,7 @@
-FROM php:5.6-apache
+FROM php:7.0-apache
+
+ENV HOST_USER_ID 33
+ENV PHP_INI_DATE_TIMEZONE 'UTC'
 
 RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libldap2-dev \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -9,11 +12,9 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libldap2-dev \
         && docker-php-ext-install mysqli \
         && apt-get purge -y libpng12-dev libjpeg-dev libldap2-dev
 
-COPY htdocs/ /var/www/html/
-
-RUN chown -hR www-data:www-data /var/www/html
-
-VOLUME /var/www/html/conf
-VOLUME /var/www/html/documents
+COPY docker-run.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-run.sh
 
 EXPOSE 80
+
+ENTRYPOINT ["docker-run.sh"]
diff --git a/build/docker/README.md b/build/docker/README.md
new file mode 100644
index 00000000000..5a0997cf121
--- /dev/null
+++ b/build/docker/README.md
@@ -0,0 +1,25 @@
+# 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)
+
+Go in repository build/docker :
+
+        cd build/docker
+
+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/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
new file mode 100644
index 00000000000..a2017335197
--- /dev/null
+++ b/build/docker/docker-compose.yml
@@ -0,0 +1,25 @@
+mariadb:
+    image: mariadb:latest
+    environment:
+        MYSQL_ROOT_PASSWORD: root
+        MYSQL_DATABASE: dolibarr
+
+phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    environment:
+        PMA_HOST: mariadb
+    links:
+        - mariadb
+    ports:
+        - "8080:80"
+
+web:
+    build: .
+    environment:
+        HOST_USER_ID: $HOST_USER_ID
+    volumes:
+        - ../../htdocs:/var/www/html
+    links:
+        - mariadb
+    ports:
+        - "80:80"
diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh
new file mode 100644
index 00000000000..c151e1c3cab
--- /dev/null
+++ b/build/docker/docker-run.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+usermod -u $HOST_USER_ID www-data
+groupmod -g $HOST_USER_ID www-data
+
+chown -hR www-data:www-data /var/www
+
+if [ ! -f /usr/local/etc/php/php.ini ]; then
+  cat <<EOF > /usr/local/etc/php/php.ini
+date.timezone = $PHP_INI_DATE_TIMEZONE
+display_errors = On
+EOF
+fi
+
+exec apache2-foreground