MCLOUD-3766: Ability to disable Elasticsearch and use MySQL instead f… (#182)

Author: shiftedreality

.github/ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,11 @@
+---
+name: Bug report
+about: Technical issue with the Magento ECE-Tools
+title: ''
+labels: ''
+assignees: ''
+---
+
 <!---
     Thank you for contributing to Magento.
     To help us process this issue we recommend that you add the following information:
@@ -33,3 +41,4 @@
 ### Actual result
 <!--- Tell us what happens instead -->
 1. [Screenshots, logs or description]
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

bin/.gitignore

@@ -1 +1 @@
-dev-ece-docker
+/dev-*

config/services.xml

@@ -26,6 +26,7 @@
         <service id="Magento\CloudDocker\Compose\ProductionBuilder" shared="false"/>
         <service id="Magento\CloudDocker\Config\Config" autowire="false"/>
         <service id="Magento\CloudDocker\Config\Source\CliSource" autowire="false"/>
+        <service id="Magento\CloudDocker\Config\Source\CustomSource" autowire="false"/>
         <service id="Composer\Semver\VersionParser"/>
         <service id="Composer\Semver\Semver"/>
     </services>

images/php/7.1-cli/Dockerfile

@@ -214,7 +214,6 @@ RUN ["chmod", "+x", \
 
 RUN mkdir -p ${MAGENTO_ROOT}
 
-VOLUME /root/.composer/cache
 VOLUME ${MAGENTO_ROOT}
 
 ENTRYPOINT ["/docker-entrypoint.sh"]

images/php/7.1-cli/bin/run-hooks

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-import yaml
 import os
 import sys
 import subprocess
-from os import path
+import json
+import base64
 
 # Disable output buffering.
 os.environ['PYTHONUNBUFFERED'] = "1"
@@ -29,19 +29,13 @@ def get_magento_root():
 
 # Gets set hooks by hook name.
 def get_hooks(hook_name):
-    config = get_magento_root() + "/.magento.docker.yaml"
-
-    if path.exists(get_magento_root() + "/.magento.app.yaml"):
-      config = get_magento_root() + "/.magento.app.yaml"
-
-    with open(config, 'r') as stream:
-        try:
-            content = yaml.safe_load(stream)
-            return content["hooks"][hook_name]
-        except yaml.YAMLError as exc:
-            error_exit(exc)
-        except KeyError:
-            error_exit("The hook \"" + hook_name + "\" is not in the \"" + config + "\"  file. Skipped", 0)
+    try:
+        application = str(os.environ['MAGENTO_CLOUD_APPLICATION'])
+        content = json.loads(base64.b64decode(application).decode("utf-8"))
+
+        return content['hooks'][hook_name]
+    except Exception as exc:
+        error_exit("Cannot decode string: " + str(exc))
 
 
 # Main function.

images/php/7.1-fpm/Dockerfile

@@ -177,7 +177,6 @@ RUN ["chmod", "+x", "/docker-entrypoint.sh"]
 
 RUN mkdir -p ${MAGENTO_ROOT}
 
-VOLUME /root/.composer/cache
 VOLUME ${MAGENTO_ROOT}
 
 ENTRYPOINT ["/docker-entrypoint.sh"]

images/php/7.2-cli/Dockerfile

@@ -214,7 +214,6 @@ RUN ["chmod", "+x", \
 
 RUN mkdir -p ${MAGENTO_ROOT}
 
-VOLUME /root/.composer/cache
 VOLUME ${MAGENTO_ROOT}
 
 ENTRYPOINT ["/docker-entrypoint.sh"]

images/php/7.2-cli/bin/run-hooks

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-import yaml
 import os
 import sys
 import subprocess
-from os import path
+import json
+import base64
 
 # Disable output buffering.
 os.environ['PYTHONUNBUFFERED'] = "1"
@@ -29,19 +29,13 @@ def get_magento_root():
 
 # Gets set hooks by hook name.
 def get_hooks(hook_name):
-    config = get_magento_root() + "/.magento.docker.yaml"
-
-    if path.exists(get_magento_root() + "/.magento.app.yaml"):
-      config = get_magento_root() + "/.magento.app.yaml"
-
-    with open(config, 'r') as stream:
-        try:
-            content = yaml.safe_load(stream)
-            return content["hooks"][hook_name]
-        except yaml.YAMLError as exc:
-            error_exit(exc)
-        except KeyError:
-            error_exit("The hook \"" + hook_name + "\" is not in the \"" + config + "\"  file. Skipped", 0)
+    try:
+        application = str(os.environ['MAGENTO_CLOUD_APPLICATION'])
+        content = json.loads(base64.b64decode(application).decode("utf-8"))
+
+        return content['hooks'][hook_name]
+    except Exception as exc:
+        error_exit("Cannot decode string: " + str(exc))
 
 
 # Main function.

images/php/7.2-fpm/Dockerfile

@@ -177,7 +177,6 @@ RUN ["chmod", "+x", "/docker-entrypoint.sh"]
 
 RUN mkdir -p ${MAGENTO_ROOT}
 
-VOLUME /root/.composer/cache
 VOLUME ${MAGENTO_ROOT}
 
 ENTRYPOINT ["/docker-entrypoint.sh"]