diff --git a/.docker/php/xdebug.ini b/.docker/php/xdebug.ini
new file mode 100644
index 00000000000..2ed1f6a9ca4
--- /dev/null
+++ b/.docker/php/xdebug.ini
@@ -0,0 +1,6 @@
+[xdebug]
+xdebug.remote_enable=1
+xdebug.remote_autostart=1
+xdebug.remote_connect_back=0
+xdebug.profiler_enable=0
+xdebug.remote_port=9001
diff --git a/.dockerignore b/.dockerignore
index c46f6b46818..fb2fe248991 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,7 +14,6 @@ changelog-linker.yaml
 
 LICENSE
 
-.git/
 .gitattributes
 .gitignore
 
@@ -28,4 +27,4 @@ docker-compose.dist.yml
 /vendor
 /docs
 
-.travis.yml export-ignore
\ No newline at end of file
+.travis.yml export-ignore
diff --git a/Dockerfile b/Dockerfile
index 63ec4bfb258..e758f3c9bb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,10 @@ COPY .docker/php/opcache.ini /usr/local/etc/php/conf.d/opcache.ini
 
 COPY composer.json composer.json
 COPY stubs stubs
+
+# This is to make parsing version possible
+COPY .git .git
+
 RUN  composer install --no-dev --optimize-autoloader --prefer-dist
 
 RUN mkdir /tmp/opcache