Merge branch 'master' into 2.2

Dockerfile

@@ -34,6 +34,8 @@ RUN cd /var/www/html \
     && find . -type f -exec chmod 660 {} \; \
     && chmod u+x bin/magento
 
+RUN su www-data -c "cd /var/www/html && composer config repositories.magento composer https://repo.magento.com/"   
+
 COPY ./bin/install-magento /usr/local/bin/install-magento
 RUN chmod +x /usr/local/bin/install-magento
 

README.md

@@ -8,6 +8,8 @@ This repo converts the [long installation guide](http://devdocs.magento.com/guid
 
 For documentation, please refer to the Magento 1.x [repo](https://github.com/alexcheng1982/docker-magento). These two Docker images follow the same instructions. 
 
+**Please note: this Docker image is for development and testing only, not for production use. Setting up a Magento 2 production server requires more configurations. Please refer to [official documentations](http://devdocs.magento.com/guides/v2.2/config-guide/deployment/).**
+
 Below are some basic instructions.
 
 ## Quick start
@@ -53,8 +55,6 @@ $ docker exec -it <container_name> install-magento
 
 ### Sample data
 
-**Please note** Not working for Magento 2.2.0 yet.
-
 ~~~
 $ docker exec -it <container_name> install-sampledata
 ~~~

bin/install-sampledata

@@ -8,4 +8,6 @@ ln -s ~/.composer/auth.json /var/www/html/var/composer_home/
 
 /var/www/html/bin/magento setup:upgrade
 
+/var/www/html/bin/magento setup:di:compile
+
 EOSU