MAGECLOUD-1829: Move Docker configuration from ECE-Tools to Hub (mage…

…nto#205)

.travis.yml

@@ -1,34 +1,27 @@
 sudo: required
 dist: trusty
-addons:
-  hosts:
-      - magento2.travis
-      - magento2.docker
+git:
+  depth: 1
 services:
-  - mysql
   - docker
-language: php
-php:
-  - 7.0
-  - 7.1
+language: generic
 env:
   global:
-    - COMPOSER_BIN_DIR=~/bin
-    - MAGENTO_HOST_NAME="magento2.travis"
-    - SANDBOX_KEY="travis"
+    - DIR_TOOLS="/var/www/ece-tools"
   matrix:
-    - TEST_SUITE=static
-    - TEST_SUITE=unit
-    - TEST_SUITE=integration
-matrix:
-  exclude:
-    - php: 7.1
-      env: TEST_SUITE=integration
+    - TEST_SUITE=static-unit PHP=7.0 XDEBUG=true
+    - TEST_SUITE=static-unit PHP=7.1 XDEBUG=true
+    - TEST_SUITE=integration PHP=7.0
+    - TEST_SUITE=integration PHP=7.1
 cache:
   apt: true
   directories:
     - $HOME/.composer/cache
-before_install: ./tests/travis/before_install.sh
-install: composer install --no-interaction
-before_script: ./tests/travis/before_script.sh
+before_install:
+  - echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./docker/composer.env
+  - echo "COMPOSER_MAGENTO_PASSWORD=${REPO_PASSWORD}" >> ./docker/composer.env
+  - if [ $XDEBUG == "true" ]; then echo "PHP_ENABLE_XDEBUG=true" >> ./docker/global.env; fi;
+install: docker-compose -f docker-compose-${PHP}.yml run cli bash -c "composer install -n -d ${DIR_TOOLS}"
+before_script: docker-compose -f docker-compose-${PHP}.yml up -d --build
 script: ./tests/travis/script.sh
+after_failure: docker ps -s

README.md

@@ -1,3 +1,5 @@
 # Magento 2 configuration
 
+[![Build Status](https://travis-ci.com/magento/ece-tools.svg?token=NW7M5gDP5YaRMZyCvYpY&branch=develop)](https://travis-ci.com/magento/ece-tools)
+
 Provides default configuration to build and deploy Magento 2 Enterprise Edition.

docker-compose.yml → docker-compose-7.0.yml

@@ -2,7 +2,7 @@ version: '2'
 services:
   fpm:
     hostname: fpm.magento2.docker
-    build: ./docker/7.0-fpm
+    image: magentodev/magento-cloud-docker-php:7.0-fpm
     ports:
       - 9000
     links:
@@ -15,12 +15,11 @@ services:
 
   cli:
     hostname: cli.magento2.docker
-    build: ./docker/7.0-cli
+    image: magentodev/magento-cloud-docker-php:7.0-cli
     links:
       - db
-#    This must be uncommented once std integration plan is removed
-#    volumes:
-#      - ~/.composer/cache:/root/.composer/cache
+    volumes:
+      - ~/.composer/cache:/root/.composer/cache
     volumes_from:
       - appdata
     env_file:
@@ -40,7 +39,7 @@ services:
       - MYSQL_PASSWORD=magento2
 
   web:
-    build: ./docker/nginx
+    image: magentodev/magento-cloud-docker-nginx:1.9
     ports:
       - "8080:80"
     links:
@@ -50,11 +49,13 @@ services:
       - appdata
     env_file:
       - ./docker/global.env
+      - ./docker/composer.env
 
   appdata:
     image: tianon/true
     volumes:
-      - .:/var/www/magento
+      - .:/var/www/ece-tools
+      - /var/www/magento
 
   dbdata:
     image: tianon/true

docker-compose-7.1.yml

@@ -0,0 +1,63 @@
+version: '2'
+services:
+  fpm:
+    hostname: fpm.magento2.docker
+    image: magentodev/magento-cloud-docker-php:7.1-fpm
+    ports:
+      - 9000
+    links:
+      - db
+    volumes_from:
+      - appdata
+    env_file:
+      - ./docker/global.env
+      - ./docker/composer.env
+
+  cli:
+    hostname: cli.magento2.docker
+    image: magentodev/magento-cloud-docker-php:7.1-cli
+    links:
+      - db
+    volumes:
+      - ~/.composer/cache:/root/.composer/cache
+    volumes_from:
+      - appdata
+    env_file:
+      - ./docker/global.env
+      - ./docker/composer.env
+
+  db:
+    image: mariadb:10
+    ports:
+      - 3306
+    volumes_from:
+      - dbdata
+    environment:
+      - MYSQL_ROOT_PASSWORD=magento2
+      - MYSQL_DATABASE=magento2
+      - MYSQL_USER=magento2
+      - MYSQL_PASSWORD=magento2
+
+  web:
+    image: magentodev/magento-cloud-docker-nginx:1.9
+    ports:
+      - "8080:80"
+    links:
+      - fpm
+      - db
+    volumes_from:
+      - appdata
+    env_file:
+      - ./docker/global.env
+      - ./docker/composer.env
+
+  appdata:
+    image: tianon/true
+    volumes:
+      - .:/var/www/ece-tools
+      - /var/www/magento
+
+  dbdata:
+    image: tianon/true
+    volumes:
+      - /var/lib/mysql