diff --git a/.docker/docker_run_git.sh b/.docker/docker_run_git.sh
index 921f2226e4c89..1001d47d91f8a 100755
--- a/.docker/docker_run_git.sh
+++ b/.docker/docker_run_git.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-echo "\n* Running composer ...";
-runuser -g www-data -u www-data -- /usr/local/bin/composer install --no-interaction
+if [ "${DISABLE_MAKE}" != "1" ]; then
+  echo "\n* Running composer ...";
+  runuser -g www-data -u www-data -- /usr/local/bin/composer install --no-interaction
 
-echo "\n* Build assets ...";
-runuser -g www-data -u www-data -- /usr/bin/make assets
+  echo "\n* Build assets ...";
+  runuser -g www-data -u www-data -- /usr/bin/make assets
+fi
 
 if [ "$DB_SERVER" = "<to be defined>" -a $PS_INSTALL_AUTO = 1 ]; then
     echo >&2 'error: You requested automatic PrestaShop installation but MySQL server address is not provided '
diff --git a/docker-compose.yml b/docker-compose.yml
index f7991e7303503..ceda510a2aef0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 volumes:
   db-data:
@@ -19,13 +19,14 @@ services:
   prestashop-git:
     build: .docker
     environment:
-      PS_INSTALL_AUTO: 1
-      DB_PASSWD: prestashop
-      DB_NAME: prestashop
-      DB_SERVER: mysql
-      PS_DOMAIN: localhost:8001
-      PS_FOLDER_INSTALL: install-dev
-      PS_FOLDER_ADMIN: admin-dev
+      DISABLE_MAKE: ${DISABLE_MAKE:-0}
+      PS_INSTALL_AUTO: ${PS_INSTALL_AUTO:-1}
+      DB_PASSWD: ${DB_PASSWD:-prestashop}
+      DB_NAME: ${DB_NAME:-prestashop}
+      DB_SERVER: ${DB_SERVER:-mysql}
+      PS_DOMAIN: ${PS_DOMAIN:-localhost:8001}
+      PS_FOLDER_INSTALL: ${PS_FOLDER_INSTALL:-install-dev}
+      PS_FOLDER_ADMIN: ${PS_FOLDER_ADMIN:-admin-dev}
     command: ["/tmp/wait-for-it.sh", "--timeout=60", "--strict", "mysql:3306", "--", "/tmp/docker_run_git.sh"]
     ports:
       - "8001:80"