Merge pull request #17 from OS2web/develop

Merge develop into staging

Author: andriyun

.docker/os2web/settings/prod.settings.php

@@ -24,6 +24,17 @@
   'username' => getenv('MYSQL_USER'),
 ];
 
+$databases['migrate']['default'] = [
+  'database' => getenv('MIGRATE_MYSQL_DATABASE'),
+  'driver' => 'mysql',
+  'host' => getenv('MIGRATE_MYSQL_HOSTNAME'),
+  'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
+  'password' => getenv('MIGRATE_MYSQL_PASSWORD'),
+  'port' => getenv('MIGRATE_MYSQL_PORT'),
+  'prefix' => '',
+  'username' => getenv('MIGRATE_MYSQL_USER'),
+];
+
 $settings['hash_salt'] = getenv('DRUPAL_HASH_SALT');
 
 $settings['file_temp_path'] = '../tmp';

.docksal/etc/php/php.ini

@@ -1,2 +1,4 @@
 memory_limit = -1
 error_log = '/var/www/logs/php-errors.log'
+#xdebug.profiler_enable = 1;
+#xdebug.profiler_output_dir = "/var/www/logs/xdebug"

.env.example

@@ -33,3 +33,13 @@
 
 ## Variable used only in docker-compose.yaml
 # OS2WEB_TAG=
+
+## Migrate DB mysql variables.
+# MIGRATE_MYSQL_DATABASE=
+# MIGRATE_MYSQL_HOSTNAME=
+# MIGRATE_MYSQL_PASSWORD=
+# MIGRATE_MYSQL_PORT=
+# MIGRATE_MYSQL_USER=
+
+## Port that is used on host machine for reaching out application
+# WEB_SERVER_PORT=8098

composer.json

@@ -50,6 +50,7 @@
         "drupal/console": "^1.0.2",
         "drupal/core": "^8.8.0",
         "drupal/core-composer-scaffold": "^8.8.0",
+        "drupal/fancy_file_delete": "^2.0",
         "drupal/gin": "^3.0",
         "drupal/gin_login": "^1.0@RC",
         "drupal/memcache": "^2.2",