Merge branch 'develop' into imported-magento-magento-cloud-docker-298

Author: shiftedreality

.travis.yml

@@ -86,12 +86,14 @@ before_install:
   # https://github.com/kylekatarnls/update-helper/issues/9
   - if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;
 
-install: if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
+install:
+  - phpenv config-add travis.php.ini
+  - if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
 
 before_script:
-  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "build-images" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi;
+  - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && ([ $TEST_SUITE == "build-images" ] || [ $TEST_SUITE == "functional" ]); then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi;
   - if [ $TEST_SUITE == "functional" ]; then sudo sysctl -w vm.max_map_count=262144; fi;
-  - if [ $TEST_SUITE == "functional" ]; then cp codeception.dist.yml codeception.yml && sed -i "s/use_generated_images:\ false/use_generated_images:\ true/" codeception.yml; fi;
+  - if [ $TEST_SUITE == "functional" ]; then cp codeception.dist.yml codeception.yml && sed -i "s/use_custom_images:\ false/use_custom_images:\ true/" codeception.yml; fi;
 
 script:
   - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && [ $TEST_SUITE == "functional" ]; then ./tests/travis/functional.sh; fi;

codeception.dist.yml

@@ -25,10 +25,10 @@ modules:
       composer_magento_username: "%REPO_USERNAME%"
       composer_magento_password: "%REPO_PASSWORD%"
       composer_github_token: "%GITHUB_TOKEN%"
-      use_generated_images: false
-      generated_images_namespace: "cloudft"
+      use_custom_images: false
+      custom_images_namespace: "cloudft"
+      version_custom_images: "%TRAVIS_BUILD_NUMBER%"
       use_cached_workdir: true
-      version_generated_images: "%TRAVIS_BUILD_NUMBER%"
       printOutput: false
     Magento\CloudDocker\Test\Functional\Codeception\Docker:
       system_magento_dir: "%Magento.docker.settings.system.magento_dir%"

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -68,6 +68,10 @@
                 "dist/mutagen.sh",
                 "mutagen.sh"
             ],
+            [
+                "dist/php.dev.ini",
+                "php.dev.ini"
+            ],
             [
                 "dist/mnt",
                 ".docker/mnt"

dist/php.dev.ini

@@ -0,0 +1,2 @@
+; configuration for development mode
+opcache.validate_timestamps = 1

images/elasticsearch/1.7/Dockerfile

@@ -18,7 +18,14 @@ COPY etc/vhost.conf /etc/nginx/conf.d/default.conf
 COPY etc/xdebug-upstream.conf /etc/nginx/conf.d/xdebug/upstream.conf
 
 RUN mkdir /etc/nginx/ssl
-COPY certs/* /etc/nginx/ssl/
+
+RUN apt-get update && \
+    apt-get install -y openssl
+
+RUN openssl req -x509 -nodes -days 730 \
+    -subj  "/C=US/ST=TX/L=Austin/O=Magento/OU=Cloud Docker/CN=magento.com" \
+     -newkey rsa:2048 -keyout /etc/nginx/ssl/magento.key \
+     -out /etc/nginx/ssl/magento.crt;
 
 VOLUME ${MAGENTO_ROOT}