Merge pull request #194 from magento/develop

Merge develop into 2002.0

Author: Bohdan Korablov

.dockerignore

@@ -0,0 +1,4 @@
+.idea/
+auth.json
+.git
+vendor

.gitignore

@@ -1,6 +1,6 @@
 .idea
 vendor
 composer.phar
-phpunit.xml
 composer.lock
 .DS_Store
+app

.travis.yml

@@ -33,10 +33,5 @@ cache:
     - $HOME/.composer/cache
 before_install: ./tests/travis/before_install.sh
 install: composer install --no-interaction
-script:
-  - if [ $TEST_SUITE == "static" ]; then phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n; fi;
-  - if [ $TEST_SUITE == "static" ]; then phpmd src xml tests/static/phpmd-ruleset.xml; fi;
-  - if [ $TEST_SUITE == "static" ]; then phpunit --configuration tests/unit/phpunit.xml.dist --coverage-clover tests/unit/tmp/clover.xml && php tests/unit/code-coverage.php tests/unit/tmp/clover.xml $MIN_CODE_COVERAGE; fi;
-  - if [ $TEST_SUITE == "unit" ]; then phpunit --configuration tests/unit/phpunit.xml.dist; fi;
-  - if [ $TEST_SUITE == "integration" ]; then phpunit --verbose --configuration tests/integration/phpunit.xml.dist; fi;
-  - if [ $TEST_SUITE == "integration-docker" ]; then cd tests/integration-docker && docker-compose run cli magento-command; fi;
+before_script: ./tests/travis/before_script.sh
+script: ./tests/travis/script.sh

bootstrap.php

@@ -11,8 +11,4 @@
 $handler = new \Magento\MagentoCloud\App\ErrorHandler();
 set_error_handler([$handler, 'handle']);
 
-$config = $_SERVER['DIRS_CONFIG'] ?? [];
-
-return new \Magento\MagentoCloud\App\Container(
-    new \Magento\MagentoCloud\Filesystem\DirectoryList(ECE_BP, BP, $config)
-);
+return new \Magento\MagentoCloud\App\Container(ECE_BP, BP);

composer.json

@@ -8,7 +8,7 @@
   ],
   "require": {
     "php": "^7.0",
-    "monolog/monolog": "^1.17",
+    "monolog/monolog": "^1.16",
     "symfony/console": "^2.6",
     "illuminate/contracts": "^5.5",
     "illuminate/container": "^5.5",
@@ -17,7 +17,7 @@
     "psr/container": "^1.0",
     "composer/composer": "@stable",
     "composer/semver": "^1.4",
-    "symfony/yaml": "^3.3"
+    "symfony/yaml": "^2.3||^3.3"
   },
   "require-dev": {
     "phpunit/phpunit": "~6.2.0",
@@ -26,6 +26,10 @@
     "php-mock/php-mock-phpunit": "^2.0",
     "phpunit/php-code-coverage": "^5.2"
   },
+  "replace": {
+    "magento/ece-patches": "*",
+    "magento/magento-cloud-configuration": "*"
+  },
   "bin": [
     "bin/ece-tools",
     "m2-ece-build",

tests/integration-docker/docker-compose.yml docker-compose.yml

@@ -1,45 +1,31 @@
-version: "2"
+version: '2'
 services:
-  web:
-    build: ./nginx
-    ports:
-      - 80
-    links:
-      - fpm
-      - db
-    volumes_from:
-      - appdata
-    env_file:
-      - ./global.env
-    environment:
-      - VIRTUAL_HOST=magento2.docker
-      - VIRTUAL_PORT=80
-      - HTTPS_METHOD=noredirect
-
   fpm:
     hostname: fpm.magento2.docker
-    build: ./7.0-fpm
+    build: ./docker/7.0-fpm
     ports:
       - 9000
     links:
       - db
     volumes_from:
       - appdata
     env_file:
-      - ./global.env
+      - ./docker/global.env
+      - ./docker/composer.env
 
   cli:
     hostname: cli.magento2.docker
-    build: ./7.0-cli
+    build: ./docker/7.0-cli
     links:
       - db
+#    This must be uncommented once std integration plan is removed
+#    volumes:
+#      - ~/.composer/cache:/root/.composer/cache
     volumes_from:
       - appdata
     env_file:
-      - ./global.env
-      - ./composer.env
-    environment:
-      - M2SETUP_VERSION=2.2.*
+      - ./docker/global.env
+      - ./docker/composer.env
 
   db:
     image: mariadb:10
@@ -52,12 +38,23 @@ services:
       - MYSQL_DATABASE=magento2
       - MYSQL_USER=magento2
       - MYSQL_PASSWORD=magento2
-      - TERM=meh
+
+  web:
+    build: ./docker/nginx
+    ports:
+      - "8080:80"
+    links:
+      - fpm
+      - db
+    volumes_from:
+      - appdata
+    env_file:
+      - ./docker/global.env
 
   appdata:
     image: tianon/true
     volumes:
-      - ./magento:/var/www/magento
+      - .:/var/www/magento
 
   dbdata:
     image: tianon/true

tests/integration-docker/.gitignore docker/.gitignore

@@ -1,2 +1 @@
-/magento
 composer.env

tests/integration-docker/7.0-cli/Dockerfile docker/7.0-cli/Dockerfile

@@ -42,7 +42,6 @@ ENV PHP_ENABLE_XDEBUG false
 ENV MAGENTO_ROOT /var/www/magento
 
 ENV DEBUG false
-ENV UPDATE_UID_GID false
 
 ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
 ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
@@ -54,11 +53,6 @@ RUN ["chmod", "+x", "/docker-entrypoint.sh"]
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
-ENV COMPOSER_GITHUB_TOKEN ""
-ENV COMPOSER_MAGENTO_USERNAME ""
-ENV COMPOSER_MAGENTO_PASSWORD ""
-ENV COMPOSER_BITBUCKET_KEY ""
-ENV COMPOSER_BITBUCKET_SECRET ""
 
 VOLUME /root/.composer/cache
 
@@ -67,10 +61,4 @@ ADD etc/php-cli.ini /usr/local/etc/php/conf.d/zz-magento.ini
 # Get composer installed to /usr/local/bin/composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-ADD bin/* /usr/local/bin/
-
-RUN ["chmod", "+x", "/usr/local/bin/magento-installer"]
-RUN ["chmod", "+x", "/usr/local/bin/magento-command"]
-RUN ["chmod", "+x", "/usr/local/bin/run-cron"]
-
 CMD ["bash"]

docker/7.0-cli/docker-entrypoint.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+[ "$DEBUG" = "true" ] && set -x
+
+# Ensure our Magento directory exists
+mkdir -p $MAGENTO_ROOT
+chown www-data:www-data $MAGENTO_ROOT
+
+# Configure Sendmail if required
+if [ "$ENABLE_SENDMAIL" == "true" ]; then
+    /etc/init.d/sendmail start
+fi
+
+# Substitute in php.ini values
+[ ! -z "${PHP_MEMORY_LIMIT}" ] && sed -i "s/!PHP_MEMORY_LIMIT!/${PHP_MEMORY_LIMIT}/" /usr/local/etc/php/conf.d/zz-magento.ini
+[ ! -z "${UPLOAD_MAX_FILESIZE}" ] && sed -i "s/!UPLOAD_MAX_FILESIZE!/${UPLOAD_MAX_FILESIZE}/" /usr/local/etc/php/conf.d/zz-magento.ini
+
+[ "$PHP_ENABLE_XDEBUG" = "true" ] && \
+    docker-php-ext-enable xdebug && \
+    echo "Xdebug is enabled"
+
+# Configure composer
+[ ! -z "${COMPOSER_GITHUB_TOKEN}" ] && \
+    composer config --global github-oauth.github.com $COMPOSER_GITHUB_TOKEN
+
+[ ! -z "${COMPOSER_MAGENTO_USERNAME}" ] && \
+    composer config --global http-basic.repo.magento.com \
+        $COMPOSER_MAGENTO_USERNAME $COMPOSER_MAGENTO_PASSWORD
+
+exec "$@"
+

tests/integration-docker/7.0-cli/etc/mail.ini docker/7.0-cli/etc/mail.ini

@@ -38,7 +38,6 @@ ENV PHP_ENABLE_XDEBUG false
 ENV MAGENTO_ROOT /var/www/magento
 
 ENV DEBUG false
-ENV UPDATE_UID_GID false
 
 ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
 ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini

tests/integration-docker/7.0-cli/etc/php-cli.ini docker/7.0-cli/etc/php-cli.ini

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+[ "$DEBUG" = "true" ] && set -x
+
+# Ensure our Magento directory exists
+mkdir -p $MAGENTO_ROOT
+chown www-data:www-data $MAGENTO_ROOT
+
+# Configure Sendmail if required
+if [ "$ENABLE_SENDMAIL" == "true" ]; then
+    /etc/init.d/sendmail start
+fi
+
+# Substitute in php.ini values
+[ ! -z "${PHP_MEMORY_LIMIT}" ] && sed -i "s/!PHP_MEMORY_LIMIT!/${PHP_MEMORY_LIMIT}/" /usr/local/etc/php/conf.d/zz-magento.ini
+[ ! -z "${UPLOAD_MAX_FILESIZE}" ] && sed -i "s/!UPLOAD_MAX_FILESIZE!/${UPLOAD_MAX_FILESIZE}/" /usr/local/etc/php/conf.d/zz-magento.ini
+
+[ "$PHP_ENABLE_XDEBUG" = "true" ] && \
+    docker-php-ext-enable xdebug && \
+    echo "Xdebug is enabled"
+
+# Configure PHP-FPM
+[ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" /usr/local/etc/php-fpm.conf
+
+exec "$@"
+

tests/integration-docker/7.0-cli/etc/php-xdebug.ini docker/7.0-cli/etc/php-xdebug.ini

@@ -1,5 +1,3 @@
 COMPOSER_GITHUB_TOKEN=0000000000000000000000000000000000000000
 COMPOSER_MAGENTO_USERNAME=00000000000000000000000000000000
 COMPOSER_MAGENTO_PASSWORD=00000000000000000000000000000000
-COMPOSER_BITBUCKET_KEY=000000000000000000
-COMPOSER_BITBUCKET_SECRET=00000000000000000000000000000000

tests/integration-docker/7.0-fpm/Dockerfile docker/7.0-fpm/Dockerfile

@@ -1,7 +1,6 @@
-MAGENTO_RUN_MODE=developer
+MAGENTO_RUN_MODE=production
 PHP_MEMORY_LIMIT=2048M
 PHP_ENABLE_XDEBUG=false
-UPDATE_UID_GID=true
 DEBUG=false
 ENABLE_SENDMAIL=true
 UPLOAD_MAX_FILESIZE=64M

docker/7.0-fpm/docker-entrypoint.sh

@@ -1,5 +1,9 @@
 FROM nginx:1.9
 
+RUN apt-get update \
+  && apt-get install -y \
+    wget
+
 ADD etc/vhost.conf /etc/nginx/conf.d/default.conf
 COPY etc/certs/ /etc/nginx/ssl/
 ADD bin/* /usr/local/bin/

tests/integration-docker/7.0-fpm/etc/mail.ini docker/7.0-fpm/etc/mail.ini

@@ -0,0 +1,26 @@
+upstream fastcgi_backend {
+  server !FPM_HOST!:!FPM_PORT!;
+}
+ server {
+    listen 80;
+    listen 443 ssl;
+
+    set $MAGE_ROOT !MAGENTO_ROOT!;
+    set $MAGE_MODE !MAGENTO_RUN_MODE!;
+
+    index index.php index.html;
+    server_name magento2.docker;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root $MAGE_ROOT/app/pub;
+
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass fpm:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+    }
+ }