#6 Enhanced installation.

README.md

@@ -20,7 +20,7 @@
     git clone [email protected]:systemseed/falcon.git
     ```
     
-3. Run `make falcon install` in the root of repository. Profit!
+3. Run `make falcon:install` in the root of repository. Profit!
 
 4. TODO
 

backend-donations/config/sync/README.txt

@@ -0,0 +1 @@
+This directory contains configuration to be imported into your Drupal site. To make this configuration active, visit admin/config/development/configuration/sync. For information about deploying configuration between servers, see https://www.drupal.org/documentation/administer/config

backend-donations/web/modules/falcon/falcon_development/falcon_development.install

@@ -37,6 +37,7 @@ function activateTestUsers() {
       $account->enforceIsNew();
       $account->setEmail('test+falcon-' . $role->id() . '@systemseed.com');
       $account->setUsername($role->id() . '.test');
+      $account->activate();
 
       if ($role->id() !== 'authenticated') {
         $account->addRole($role->id());

backend-donations/web/sites/default/settings.local.php

@@ -14,7 +14,7 @@
 $settings['file_private_path'] = preg_replace('~/web$~', '/private', $app_root);
 
 // Enable local development services.
-$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/development.services.yml';
+$settings['container_yamls'][] = __DIR__ . '/services.development.yml';
 
 // Configure base url for images going outside of the site.
 $config['rest_absolute_urls']['base_url'] = 'http://donations.api.flc.local';

backend-donations/web/sites/default/settings.php

@@ -4,7 +4,7 @@
 $databases = [];
 $config_directories = [];
 $settings['update_free_access'] = FALSE;
-$settings['container_yamls'][] = $app_root . '/services.yml';
+$settings['container_yamls'][] = __DIR__ . '/services.yml';
 $settings['file_scan_ignore_directories'] = [
   'node_modules',
   'bower_components',

backend-gifts/web/modules/falcon/falcon_development/falcon_development.install

@@ -37,6 +37,7 @@ function activateTestUsers() {
       $account->enforceIsNew();
       $account->setEmail('test+falcon-' . $role->id() . '@systemseed.com');
       $account->setUsername($role->id() . '.test');
+      $account->activate();
 
       if ($role->id() !== 'authenticated') {
         $account->addRole($role->id());

backend-gifts/web/sites/default/settings.local.php

@@ -11,7 +11,7 @@
 $config['system.logging']['error_level'] = 'verbose';
 
 // Enable local development services.
-$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/development.services.yml';
+$settings['container_yamls'][] =  __DIR__ . '/services.development.yml';
 
 // Set private files folder.
 $settings['file_private_path'] = preg_replace('~/web$~', '/private', $app_root);

backend-gifts/web/sites/default/settings.php

@@ -4,7 +4,7 @@
 $databases = [];
 $config_directories = [];
 $settings['update_free_access'] = FALSE;
-$settings['container_yamls'][] = $app_root . '/services.yml';
+$settings['container_yamls'][] = __DIR__ . '/services.yml';
 $settings['file_scan_ignore_directories'] = [
   'node_modules',
   'bower_components',

docker/docker-compose.yml

@@ -55,6 +55,8 @@ services:
 
   be_gifts:
     image: wodby/drupal-php:7.1-dev-4.2.3
+    depends_on:
+      - be_gifts_mariadb
     environment:
       PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
       DB_HOST: drupal
@@ -64,7 +66,7 @@ services:
       DB_DRIVER: mysql
 
   be_gifts_mariadb:
-    image: wodby/mariadb:10.2-3.1.3
+    image: wodby/mariadb:10.1-3.1.3
     stop_grace_period: 30s
     environment:
       MYSQL_ROOT_PASSWORD: drupal
@@ -104,6 +106,8 @@ services:
 
   be_donations:
     image: wodby/drupal-php:7.1-dev-4.2.3
+    depends_on:
+      - be_donations_mariadb
     environment:
       PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
       DB_HOST: drupal
@@ -113,7 +117,7 @@ services:
       DB_DRIVER: mysql
 
   be_donations_mariadb:
-    image: wodby/mariadb:10.2-3.1.3
+    image: wodby/mariadb:10.1-3.1.3
     stop_grace_period: 30s
     environment:
       MYSQL_ROOT_PASSWORD: drupal