Explorar o código

Updated docker-compose.yml for new mageinferno/magento2-setup:1.1.0 image

Mark Shust %!s(int64=9) %!d(string=hai) anos
pai
achega
0c80e03050
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      docker-compose.yml

+ 3 - 1
docker-compose.yml

@@ -12,6 +12,7 @@ appdata:
   image: tianon/true
   image: tianon/true
   volumes:
   volumes:
     - ./src:/src
     - ./src:/src
+    - ./src-sample-data:/src-sample-data
     - ~/.composer:/root/.composer
     - ~/.composer:/root/.composer
 
 
 "php-fpm":
 "php-fpm":
@@ -39,7 +40,7 @@ dbdata:
     - /var/lib/mysql
     - /var/lib/mysql
 
 
 setup:
 setup:
-  image: mageinferno/magento2-setup:1.0
+  image: mageinferno/magento2-setup:1.1
   links:
   links:
     - db
     - db
   volumes_from:
   volumes_from:
@@ -55,6 +56,7 @@ setup:
     - M2SETUP_ADMIN_EMAIL=dummy@gmail.com
     - M2SETUP_ADMIN_EMAIL=dummy@gmail.com
     - M2SETUP_ADMIN_USER=magento2
     - M2SETUP_ADMIN_USER=magento2
     - M2SETUP_ADMIN_PASSWORD=magento2
     - M2SETUP_ADMIN_PASSWORD=magento2
+    - M2SETUP_GITHUB_BRANCH=merchant_beta
     - M2SETUP_USE_SAMPLE_DATA=true
     - M2SETUP_USE_SAMPLE_DATA=true
     - M2SETUP_PULL_GITHUB=true
     - M2SETUP_PULL_GITHUB=true
     - M2SETUP_PULL_COMPOSER=true
     - M2SETUP_PULL_COMPOSER=true