Merge branch 'develop' into 1.1-fwd

Author: shiftedreality

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,7 +16,7 @@
 
 ### Fixed Issues (if relevant)
 <!---
-    If relevant, please provide a list of fixed issues in the format magento/ece-tools#<issue_number>.
+    If relevant, please provide a list of fixed issues in the format magento/magento-cloud-docker#<issue_number>.
     There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
 -->
 1. magento/magento-cloud-docker#<issue_number>: Issue title
@@ -30,6 +30,17 @@
 1. ...
 2. ...
 
+### Release notes
+
+For user-facing changes, add a meaningful release note. For examples, see [Magento Cloud Docker release notes](https://devdocs.magento.com/cloud/release-notes/mcd-release-notes.html).
+
+### Associated documentation updates
+<!--
+ If your proposed update requires user documentation, submit a PR to the Magento DevDocs repository. For extensive updates requiring assistance, submit an issue to DevDocs. See https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md.
+ -->
+Add link to Magento DevDocs PR or Issue, if needed.
+
 ### Contribution checklist
  - [ ] Pull request has a meaningful description of its purpose
+ - [ ] Pull request introduces user-facing changes and includes meaningful release notes and documentation
  - [ ] All commits are accompanied by meaningful commit messages

.travis.yml

@@ -23,29 +23,29 @@ stages:
 jobs:
   include:
     - stage: static-unit
-      php: '7.1'
+      php: '7.2'
       script: ./tests/travis/static-unit.sh;
       env:
         - TEST_SUITE=static-unit
     - script: ./tests/travis/static-unit.sh;
-      php: '7.2'
+      php: '7.3'
       env:
         - TEST_SUITE=static-unit
     - script: ./tests/travis/static-unit.sh;
-      php: '7.3'
+      php: '7.4'
       env:
         - TEST_SUITE=static-unit
     - stage: integration
       script: ./vendor/bin/phpunit --configuration ./tests/integration;
-      php: '7.1'
+      php: '7.2'
       env:
         - TEST_SUITE=integration
     - script: ./vendor/bin/phpunit --configuration ./tests/integration;
-      php: '7.2'
+      php: '7.3'
       env:
         - TEST_SUITE=integration
     - script: ./vendor/bin/phpunit --configuration ./tests/integration;
-      php: '7.3'
+      php: '7.4'
       env:
         - TEST_SUITE=integration
     - stage: build-images
@@ -56,11 +56,6 @@ jobs:
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh varnish; fi;
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh elasticsearch; fi;
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh nginx; fi;
-    - script:
-        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.1-cli; fi;
-        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.1-fpm; fi;
-      env:
-        - TEST_SUITE=build-images
     - script:
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.2-cli; fi;
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.2-fpm; fi;
@@ -71,12 +66,13 @@ jobs:
         - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.3-fpm; fi;
       env:
         - TEST_SUITE=build-images
-    - stage: test
-      php: '7.1'
-      dist: xenial
+    - script:
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.4-cli; fi;
+        - if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then ./tests/travis/images.sh php 7.4-fpm; fi;
       env:
-        - TEST_SUITE=functional
-    - php: '7.2'
+        - TEST_SUITE=build-images
+    - stage: test
+      php: '7.2'
       dist: xenial
       env:
         - TEST_SUITE=functional

composer.json

@@ -2,13 +2,13 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2",
         "ext-json": "*",
         "composer/composer": "^1.0",
         "composer/semver": "^1.0",
@@ -19,12 +19,15 @@
         "symfony/yaml": "^3.3||^4.0"
     },
     "require-dev": {
+        "codeception/codeception": "^4.1",
+        "codeception/module-asserts": "^1.2",
+        "codeception/module-db": "^1.0",
+        "codeception/module-phpbrowser": "^1.0",
+        "consolidation/robo": "^1.2",
         "phpmd/phpmd": "@stable",
         "phpstan/phpstan": "^0.11",
-        "phpunit/phpunit": "^7.2",
-        "squizlabs/php_codesniffer": "^3.0",
-        "codeception/codeception": "^2.5.3",
-        "consolidation/robo": "^1.2"
+        "phpunit/phpunit": "^8.5",
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "bin": [
         "bin/ece-docker"

dist/bin/magento-docker

@@ -19,13 +19,21 @@ USAGE="Magento Cloud Docker
   flush-redis       clears redis cache
   flush-varnish     clears varnish cache
   ece-db            access to Database
+  php 7.1           run a command in a PHP 7.1 container
+  php 7.2           run a command in a PHP 7.2 container
+  php 7.3           run a command in a PHP 7.3 container
+  php 7.4           run a command in a PHP 7.4 container
 
 \033[33mOptions:\033[0m
   -h            show this help text\n"
 
-if [ ${#@} -ne 0 ] && [ "${@#"-h"}" = "" ]; then
-    printf "$USAGE"
-    exit 0;
+if [ ${#@} -ne 0 ]; then
+    for arg in "$@"; do
+        if [ "${arg#"-h"}" = "" ]; then
+            printf "$USAGE"
+            exit 0;
+        fi
+    done
 fi;
 
 case "$1" in
@@ -74,6 +82,19 @@ case "$1" in
     ece-db)
         docker-compose exec db sh -c 'mysql -u $MYSQL_USER -p$MYSQL_PASSWORD $MYSQL_DATABASE "$@"'
         ;;
+    php)
+        version="$2"
+        shift 2
+        # allow ssh-agent forwarding for composer.json files that need access to private repos
+        if [[ $(uname) = Darwin ]]; then
+            # https://docs.docker.com/docker-for-mac/osxfs/#ssh-agent-forwarding (D4M > 2.2)
+            export SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock"
+        fi
+        docker run --rm -it -e "MAGENTO_ROOT=/app" -v "$(pwd)":/app -v ~/.composer/cache:/root/.composer/cache \
+            --mount "type=bind,src=$HOME/.ssh/known_hosts,target=/root/.ssh/known_hosts" \
+            --mount "type=bind,src=$SSH_AUTH_SOCK,target=$SSH_AUTH_SOCK" -e SSH_AUTH_SOCK="$SSH_AUTH_SOCK" \
+            "magento/magento-cloud-docker-php:${version}-cli-1.1" "$@"
+        ;;
     *)
         printf "$USAGE"
         exit 0;

images/elasticsearch/7.7/Dockerfile

@@ -0,0 +1,12 @@
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.7.1
+
+RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
+RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml
+RUN bin/elasticsearch-plugin install -b analysis-icu && \
+    bin/elasticsearch-plugin install -b analysis-phonetic
+
+ADD docker-healthcheck.sh /docker-healthcheck.sh
+
+HEALTHCHECK --retries=3 CMD ["bash", "/docker-healthcheck.sh"]
+
+EXPOSE 9200 9300

images/elasticsearch/7.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/nginx/1.9/docker-entrypoint.sh

@@ -14,6 +14,7 @@ XDEBUG_UPSTREAM_FILE="/etc/nginx/conf.d/xdebug/upstream.conf"
 [ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" $VHOST_FILE
 [ ! -z "${MFTF_UTILS}" ] && sed -i "s/!MFTF_UTILS!/${MFTF_UTILS}/" $VHOST_FILE
 [ ! -z "${UPLOAD_MAX_FILESIZE}" ] && sed -i "s/!UPLOAD_MAX_FILESIZE!/${UPLOAD_MAX_FILESIZE}/" $VHOST_FILE
+[ ! -z "${WITH_XDEBUG}" ] && sed -i "s/!WITH_XDEBUG!/${WITH_XDEBUG}/" $VHOST_FILE
 [ "${WITH_XDEBUG}" == "1" ] && sed -i "s/#include_xdebug_upstream/include/" $NGINX_FILE
 
 # Check if the nginx syntax is fine, then launch.

images/nginx/1.9/etc/vhost.conf

@@ -14,7 +14,7 @@ server {
     set $MAGE_ROOT !MAGENTO_ROOT!; # Variable: MAGENTO_ROOT
     set $MAGE_MODE !MAGENTO_RUN_MODE!; # Variable: MAGENTO_RUN_MODE
     set $MFTF_UTILS !MFTF_UTILS!; # Variable: MFTF_UTILS
-    set $WITH_XDEBUG !$WITH_XDEBUG!; # Variable: WITH_XDEBUG
+    set $WITH_XDEBUG !WITH_XDEBUG!; # Variable: WITH_XDEBUG
 
     set $my_fastcgi_pass "fastcgi_backend";
     if ($cookie_XDEBUG_SESSION) {