Merge branch 'master' into demo_master

ezecosystem · Aug 20, 2018 · 7844edb · 7844edb
2 parents 07c5df4 + 37eae0d
commit 7844edb
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 17 deletions.
diff --git a/.env b/.env
@@ -10,8 +10,8 @@ DATABASE_PASSWORD=SetYourOwnPassword
 DATABASE_NAME=ezp
 
 ## Docker images (name and version)
-PHP_IMAGE=ezsystems/php:7.1-v1
-PHP_IMAGE_DEV=ezsystems/php:7.1-v1-dev
+PHP_IMAGE=ezsystems/php:7.2-v1
+PHP_IMAGE_DEV=ezsystems/php:7.2-v1-dev
 NGINX_IMAGE=nginx:stable
 MYSQL_IMAGE=healthcheck/mariadb
 SELENIUM_IMAGE=selenium/standalone-chrome-debug:3.4.0

diff --git a/.platform.app.yaml b/.platform.app.yaml
@@ -25,6 +25,8 @@ relationships:
     # If you wish to have a separate Redis instance for sessions, uncomment
     # this relationship and the corresponding service in .platform/services.yaml
     #redissession: 'redissession:redis'
+    # If you wish to use solr, uncomment this relationship and the corresponding service in .platform/services.yaml
+    #solr: 'solrsearch:solr'
 
 variables:
     #php:

diff --git a/.platform/services.yaml b/.platform/services.yaml
@@ -33,3 +33,21 @@ rediscache:
 #redissession:
 #    type: redis-persistent:3.2
 #    disk: 1024
+
+# If you wish to use solr, uncomment this service and the corresponding relationship in .platform.app.yaml.
+# Also, you need to generate the config using:
+# vendor/ezsystems/ezplatform-solr-search-engine/bin/generate-solr-config.sh
+#solrsearch:
+#    type: solr:6.6
+#    disk: 512
+#    configuration:
+#        configsets:
+#            mainconfig: !archive "configsets/solr6"
+#        cores:
+#            collection1:
+#                core_properties: |
+#                    configSet=mainconfig
+#                    schema=schema.xml
+#        endpoints:
+#            collection1:
+#                core: collection1
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -25,7 +25,7 @@ doctrine:
                 dbname: '%database_name%'
                 user: '%database_user%'
                 password: '%database_password%'
-                charset: UTF8
+                charset: utf8mb4
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
         naming_strategy: doctrine.orm.naming_strategy.underscore

diff --git a/app/config/dfs/dfs.yml b/app/config/dfs/dfs.yml
@@ -9,7 +9,7 @@ doctrine:
                 user: "%dfs_database_user%"
                 password: "%dfs_database_password%"
                 dbname: "%dfs_database_name%"
-                charset: UTF8
+                charset: utf8mb4
 
 # define the flysystem handler
 oneup_flysystem:

diff --git a/app/config/env/platformsh.php b/app/config/env/platformsh.php
@@ -117,3 +117,14 @@
         $container->setParameter('ezplatform.session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
     }
 }
+
+if (isset($relationships['solr'])) {
+    foreach ($relationships['solr'] as $endpoint) {
+        if ($endpoint['scheme'] !== 'solr') {
+            continue;
+        }
+
+        $container->setParameter('search_engine', 'solr');
+        $container->setParameter('solr_dsn', sprintf('http://%s:%d/%s', $endpoint['host'], $endpoint['port'], 'solr'));
+    }
+}
diff --git a/doc/apache2/Readme.md b/doc/apache2/Readme.md
@@ -76,7 +76,7 @@ Example config for Apache 2.4 in prefork mode:
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

diff --git a/doc/apache2/vhost.2.2.template b/doc/apache2/vhost.2.2.template
@@ -80,7 +80,7 @@
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

diff --git a/doc/apache2/vhost.template b/doc/apache2/vhost.template
@@ -91,7 +91,7 @@
         RewriteRule ^/assets/ - [L]
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         RewriteCond %{ENV:SYMFONY_ENV} !^(dev)
         RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
 

diff --git a/doc/docker/Dockerfile-app b/doc/docker/Dockerfile-app
@@ -1,4 +1,5 @@
-FROM ezsystems/php:7.1-v1 as builder
+ARG PHP_IMAGE=ezsystems/php:7.2-v1
+FROM ${PHP_IMAGE} as builder
 
 # This is prod image (for dev use just mount your application as host volume into php image we extend here)
 ENV SYMFONY_ENV=prod
@@ -27,7 +28,7 @@ RUN rm -Rf var/logs/* var/cache/*/*
 RUN rm -rf web/css web/fonts web/js web/var
 
 
-FROM ezsystems/php:7.1-v1
+FROM ${PHP_IMAGE}
 
 # This is prod image (for dev use just mount your application as host volume into php image we extend here)
 ENV SYMFONY_ENV=prod

diff --git a/doc/docker/Dockerfile-nginx b/doc/docker/Dockerfile-nginx
@@ -1,4 +1,5 @@
-FROM ezsystems/php:7.1-v1 as web-build
+ARG PHP_IMAGE=ezsystems/php:7.2-v1
+FROM ${PHP_IMAGE} as web-build
 
 ENV SYMFONY_ENV=prod
 

diff --git a/doc/docker/base-prod.yml b/doc/docker/base-prod.yml
@@ -6,6 +6,8 @@ services:
     build:
       context: ../../
       dockerfile: ${APP_DOCKER_FILE}
+      args:
+       - PHP_IMAGE
     depends_on:
      - db
     environment:
@@ -27,6 +29,8 @@ services:
     build:
       context: ../../
       dockerfile: doc/docker/Dockerfile-nginx
+      args:
+       - PHP_IMAGE
     depends_on:
      - app
     ports:

diff --git a/doc/docker/distribution.yml b/doc/docker/distribution.yml
@@ -14,7 +14,7 @@ services:
      - backend
 
   app:
-    image: ezsystems/php:7.1-v1
+    image: ${PHP_IMAGE}
     depends_on:
      - db
      - distribution
@@ -38,7 +38,7 @@ services:
      - vardir:/var/www/web/var
 
   web:
-    image: nginx:stable
+    image: ${NGINX_IMAGE}
     depends_on:
      - distribution
      - app

diff --git a/doc/nginx/Readme.md b/doc/nginx/Readme.md
@@ -42,7 +42,7 @@ Example config:
         root /var/www/ezinstall/web;
 
         # Additional Assetic rules for environments different from dev,
-        # remember to run php app/console assetic:dump --env=prod
+        # remember to run php bin/console assetic:dump --env=prod
         # and make sure to comment these out in "dev" environment.
         include ez_params.d/ez_prod_rewrite_params;
 

diff --git a/doc/nginx/ez_params.d/ez_prod_rewrite_params b/doc/nginx/ez_params.d/ez_prod_rewrite_params
@@ -1,6 +1,6 @@
 
-# Additional Assetic rules for eZ Publish 5.1 / 2013.4 and higher.
-## Don't forget to run php app/console assetic:dump --env=prod
+# Additional Assetic rules
+## Don't forget to run php bin/console assetic:dump --env=prod
 ## and make sure to comment these out in DEV environment.
 rewrite "^/css/(.*)\.css" "/css/$1.css" break;
 rewrite "^/js/(.*)\.js" "/js/$1.js" break;

diff --git a/doc/nginx/vhost.template b/doc/nginx/vhost.template
@@ -6,8 +6,8 @@ server {
 
     root %BASEDIR%/web;
 
-    # Additional Assetic rules for eZ Publish 5.1 / 2013.4 and higher.
-    ## Don't forget to run php app/console assetic:dump --env=prod
+    # Additional Assetic rules
+    ## Don't forget to run php bin/console assetic:dump --env=prod
     ## and make sure to comment these out in DEV environment.
     #if[SYMFONY_ENV!=dev] include ez_params.d/ez_prod_rewrite_params;