From f4711c4803aa6a28220e1584649e6a86b47e28ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=CC=81=20R?= Date: Sun, 4 Jun 2017 16:32:02 +0200 Subject: [PATCH] [Doc] Bump Docker & Docker Compose requirement to reflect we now use compose format 2.1 --- doc/docker-compose/README.md | 2 +- doc/docker-compose/solr.yml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/docker-compose/README.md b/doc/docker-compose/README.md index 9f205c027e..bfc31c0bd8 100644 --- a/doc/docker-compose/README.md +++ b/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._ diff --git a/doc/docker-compose/solr.yml b/doc/docker-compose/solr.yml index af3122424b..4c45f3710c 100644 --- a/doc/docker-compose/solr.yml +++ b/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)