Merge branches 'MAGECLOUD-5215' and 'develop' of https://github.com/magento/magento-cloud-docker into MAGECLOUD-5215

� Conflicts:
�	src/Command/BuildCompose.php
�	src/Compose/FunctionalBuilder.php
�	src/Compose/ProductionBuilder.php

Author: shiftedreality

.github/CONTRIBUTING.md

@@ -24,7 +24,7 @@ You must have a [GitHub account](https://help.github.com/en/github/getting-start
 
 ## Contribution process
 1. Search current [listed issues](https://github.com/magento/magento-cloud-docker/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
-2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
+2. Review and sign the [Contributor License Agreement (CLA)](https://opensource.adobe.com/cla.html) if this is your first time contributing. You only need to sign the CLA once.
 3. Create and test your work.
 4. Fork the Magento Cloud repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
 5. After you submit the pull request, the Magento Cloud development team will review the contribution and collaborate with you as needed to incorporate your proposed changes.

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

dist/mutagen.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+mutagen terminate --label-selector=magento-docker
+mutagen terminate --label-selector=magento-docker-vendor
+
 mutagen create \
        --label=magento-docker \
        --sync-mode=two-way-resolved \
@@ -8,10 +11,19 @@ mutagen create \
        --ignore=/.magento \
        --ignore=/.docker \
        --ignore=/.github \
+       --ignore=/vendor \
        --ignore=*.sql \
        --ignore=*.gz \
        --ignore=*.zip \
        --ignore=*.bz2 \
        --ignore-vcs \
        --symlink-mode=posix-raw \
        ./ docker://$(docker-compose ps -q fpm|awk '{print $1}')/app
+
+mutagen create \
+       --label=magento-docker-vendor \
+       --sync-mode=two-way-resolved \
+       --default-file-mode=0644 \
+       --default-directory-mode=0755 \
+       --symlink-mode=posix-raw \
+       ./vendor docker://$(docker-compose ps -q fpm|awk '{print $1}')/app/vendor

images/elasticsearch/1.7/Dockerfile

@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN plugin --install elasticsearch/elasticsearch-analysis-icu/2.7.0 && \
     plugin --install elasticsearch/elasticsearch-analysis-phonetic/2.7.0
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300

images/elasticsearch/1.7/docker-healthcheck.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1

images/elasticsearch/2.4/Dockerfile

@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN bin/plugin install analysis-icu && \
     bin/plugin install analysis-phonetic
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300

images/elasticsearch/2.4/docker-healthcheck.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1

images/elasticsearch/5.2/Dockerfile

@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN bin/elasticsearch-plugin install analysis-icu && \
     bin/elasticsearch-plugin install analysis-phonetic
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300

images/elasticsearch/5.2/docker-healthcheck.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+if health="$(curl -fsSL "http://${ES_HOST:-elasticsearch}:${ES_PORT:-9200}/_cat/health?h=status")"; then
+  health="$(echo "$health" | sed -r 's/^[[:space:]]+|[[:space:]]+$//g')" # trim whitespace (otherwise we'll have "green ")
+  if [ "$health" = 'green' ] || [ "$health" = 'yellow' ]; then
+    exit 0
+  fi
+  echo >&2 "Unexpected health status: $health"
+fi
+
+exit 1

images/elasticsearch/6.5/Dockerfile

@@ -4,4 +4,8 @@ RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elas
 RUN bin/elasticsearch-plugin install analysis-icu && \
     bin/elasticsearch-plugin install analysis-phonetic
 
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["sh", "/docker-healthcheck.sh"]
+
 EXPOSE 9200 9300