Skip to content
This repository has been archived by the owner on Aug 8, 2018. It is now read-only.

Commit

Permalink
#6 Enhanced installation.
Browse files Browse the repository at this point in the history
  • Loading branch information
spleshka authored and duozersk committed Jun 7, 2018
1 parent 0d4872c commit 55d9f1c
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 91 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions backend-donations/config/sync/README.txt
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion backend-donations/web/sites/default/settings.local.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion backend-donations/web/sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion backend-gifts/web/sites/default/settings.local.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion backend-gifts/web/sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 6 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,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
Expand All @@ -62,7 +64,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
Expand Down Expand Up @@ -102,6 +104,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
Expand All @@ -111,7 +115,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
Expand Down
49 changes: 0 additions & 49 deletions local-prepare.sh

This file was deleted.

35 changes: 0 additions & 35 deletions local-sql-dump.sh

This file was deleted.

0 comments on commit 55d9f1c

Please sign in to comment.