MAGECLOUD-3582: [Cloud Docker] Default path during bash connection sh… (#24)

shiftedreality · web-flow · commit bc5ecaefef43 · 2019-05-28T14:28:08.000-05:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,35 @@
+<!---
+    Thank you for contributing to Magento.
+    To help us process this issue we recommend that you add the following information:
+     - Summary of the issue,
+     - Information on your environment,
+     - Steps to reproduce,
+     - Expected and actual results,
+
+    Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
+
+### Preconditions
+<!---
+    Please provide as detailed information about your environment as possible.
+    For example Magento version, tag, HEAD, PHP & MySQL version, etc..
+-->
+1. 
+2. 
+
+### Steps to reproduce
+<!---
+    It is important to provide a set of clear steps to reproduce this bug.
+    If relevant please include code samples
+-->
+1. 
+2. 
+3. 
+
+### Expected result
+<!--- Tell us what should happen -->
+1. [Screenshots, logs or description]
+
+### Actual result
+<!--- Tell us what happens instead -->
+1. [Screenshots, logs or description]
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,35 @@
+<!---
+    Thank you for contributing to Magento.
+    To help us process this pull request we recommend that you add the following information:
+     - Summary of the pull request,
+     - Issue(s) related to the changes made,
+     - Manual testing scenarios,
+-->
+
+<!--- Please provide a general summary of the Pull Request in the Title above -->
+
+### Description
+<!---
+    Please provide a description of the changes proposed in the pull request.
+    Letting us know what has changed and why it needed changing will help us validate this pull request.
+-->
+
+### Fixed Issues (if relevant)
+<!---
+    If relevant, please provide a list of fixed issues in the format magento/ece-tools#<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
+2. ...
+
+### Manual testing scenarios
+<!---
+    Please provide a set of unambiguous steps to test the proposed code change.
+    Giving us manual testing scenarios will help with the processing and validation process.
+-->
+1. ...
+2. ...
+
+### Contribution checklist
+ - [ ] Pull request has a meaningful description of its purpose
+ - [ ] All commits are accompanied by meaningful commit messages
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Inspired by [meanbee/docker-magento2](https://github.com/meanbee/docker-magento2
 
 ## Installation
 
-1. To be able to use this Docker configuration, you must have cloned [Magento Cloud](https://github.com/magento/magento-cloud)  project
+1. To be able to use this Docker configuration, you must have cloned [Magento Cloud](https://github.com/magento/magento-cloud) project
 1. Follow instruction on [DevDocs](https://devdocs.magento.com/guides/v2.2/cloud/reference/docker-config.html)
 
 ## Generating new PHP configuration
@@ -33,26 +33,6 @@ Where:
 
 - `version`: Version of PHP to be generated
 
-## Executing commands
-
-### Connecting to CLI container
-
-```bash
-docker-compose run cli bash
-```
-
-### Running Magento command
-
-```bash
-docker-compose run cli magento-command
-```
-
-### Running ECE-Tools command
-
-```bash
-docker-compose run cli ece-command
-```
-
 [ico-dockerbuild]: https://img.shields.io/docker/build/magento/magento-cloud-docker-php.svg?style=flat-square
 [ico-downloads]: https://img.shields.io/docker/pulls/magento/magento-cloud-docker-php.svg?style=flat-square
 [ico-dockerstars]: https://img.shields.io/docker/stars/magento/magento-cloud-docker-php.svg?style=flat-square
diff --git a/data/php-cli/Dockerfile b/data/php-cli/Dockerfile
@@ -31,7 +31,7 @@ RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 
diff --git a/data/php-fpm/Dockerfile b/data/php-fpm/Dockerfile
@@ -19,13 +19,11 @@ RUN docker-php-ext-configure \
 
 # Install required PHP extensions
 RUN docker-php-ext-install {%extensions%}
-
 RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
-
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
diff --git a/nginx/1.9/Dockerfile b/nginx/1.9/Dockerfile
@@ -9,11 +9,12 @@ EXPOSE 80 443
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV FPM_HOST fpm
 ENV FPM_PORT 9000
-ENV MAGENTO_ROOT /var/www/magento
+ENV MAGENTO_ROOT /app
 ENV MAGENTO_RUN_MODE production
 ENV DEBUG false
 
 RUN ["chmod", "+x", "/usr/local/bin/docker-environment"]
 
 ENTRYPOINT ["/usr/local/bin/docker-environment"]
+
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/php/7.0-cli/Dockerfile b/php/7.0-cli/Dockerfile
@@ -31,7 +31,7 @@ RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 
diff --git a/php/7.0-fpm/Dockerfile b/php/7.0-fpm/Dockerfile
@@ -19,13 +19,11 @@ RUN docker-php-ext-configure \
 
 # Install required PHP extensions
 RUN docker-php-ext-install dom gd intl mbstring pdo_mysql xsl zip bcmath soap sockets opcache mcrypt pcntl
-
 RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
-
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
diff --git a/php/7.1-cli/Dockerfile b/php/7.1-cli/Dockerfile
@@ -31,7 +31,7 @@ RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 
diff --git a/php/7.1-fpm/Dockerfile b/php/7.1-fpm/Dockerfile
@@ -19,13 +19,11 @@ RUN docker-php-ext-configure \
 
 # Install required PHP extensions
 RUN docker-php-ext-install dom gd intl mbstring pdo_mysql xsl zip bcmath soap sockets opcache mcrypt pcntl
-
 RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
-
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
diff --git a/php/7.2-cli/Dockerfile b/php/7.2-cli/Dockerfile
@@ -31,7 +31,7 @@ RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 
diff --git a/php/7.2-fpm/Dockerfile b/php/7.2-fpm/Dockerfile
@@ -19,13 +19,11 @@ RUN docker-php-ext-configure \
 
 # Install required PHP extensions
 RUN docker-php-ext-install dom gd intl mbstring pdo_mysql xsl zip bcmath soap sockets opcache
-
 RUN pecl install -o -f xdebug
 
 ENV PHP_MEMORY_LIMIT 2G
 ENV PHP_ENABLE_XDEBUG false
-ENV MAGENTO_ROOT /var/www/magento
-
+ENV MAGENTO_ROOT /app
 ENV DEBUG false
 
 COPY etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
