Merge branch '1.9'

doc/docker-compose/README.md

@@ -10,7 +10,7 @@
 
 ## Overview
 
-This setup requires Docker Compose 1.7 or higher, and Docker 1.10 or higher. Defaults are set in `.env`, and
+This setup requires Docker Compose 1.9 or higher, and Docker 1.12 or higher. Defaults are set in `.env`, and
 files to ignore are set in `.dockerignore`. By default `.env` specifies that production image is built and setup for use.
 _**NB:** For this and other reasons all docker-compose commands **must** be executed from root of your project directory._
 

doc/docker-compose/solr.yml

@@ -1,8 +1,6 @@
 version: '2.1'
 # Solr config, to be appended after base-prod or base-dev, ..., but before selenium.yml
 #
-# This service will migrate to use offical Solr image and use entrypoint once Solr bundle supports SOLR6+.
-#
 # NOTE: You'll need to manually reindex the solr index when booting this as we don't have entrypoint for solr yet.
 #       (Unless you use ezplatform:install command which indexes for you)