Refactor deployment #159
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "COMPOSER_INSTALL_OPTIONS": [ | ||
| "--no-dev --optimize-autoloader --no-progress --no-interaction" | ||
| ], | ||
| "COMPOSER_VENDOR_DIR": "vendor", | ||
| "WEBDIR": "web", | ||
| "PHP_EXTENSIONS": ["bz2", "zlib", "curl", "mcrypt", "gd", "pdo", "pdo_mysql", "mbstring"], | ||
| "ADDITIONAL_PREPROCESS_CMDS": [ | ||
| "$HOME/bootstrap.sh" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ; Maximum amount of memory a script may consume (128MB) | ||
| ; http://php.net/memory-limit | ||
| memory_limit = 512M |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # Ignore directories generated by Composer | ||
| /drush/contrib/ | ||
| /vendor/ | ||
| /web/core/ | ||
| /web/modules/contrib/ | ||
| /web/themes/contrib/ | ||
| /web/profiles/contrib/ | ||
| /web/libraries/ | ||
|
|
||
| # Typically, composer generates a .gitignore to ignore the | ||
| # `settings.php` files. For cloud.gov and Cloud Foundry, no sensitive | ||
| # information is stored in the settings files. Instead, those files | ||
| # have code that parses environment variables for DB and S3 | ||
| # | ||
| # Ignore sensitive information [This is a `composer` default] | ||
| # /web/sites/*/settings.php | ||
| # /web/sites/*/settings.local.php | ||
|
|
||
|
|
||
| # Ignore Drupal's file directory | ||
| /web/sites/*/files/ | ||
|
|
||
| # Ignore SimpleTest multi-site environment. | ||
| /web/sites/simpletest | ||
|
|
||
| # Ignore files generated by PhpStorm | ||
| /.idea/ | ||
|
|
||
| .DS_Store | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| --- | ||
| packages: | ||
| - mysql-client | ||
|
There was a problem hiding this comment. Looks like we're just using the PHP buildpack now -- is this file still needed? |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| #!/bin/bash | ||
| set -euo pipefail | ||
|
|
||
| SECRETS=$(echo $VCAP_SERVICES | jq -r '.["user-provided"][] | select(.name == "secrets") | .credentials') | ||
|
|
||
| install_drupal() { | ||
| ROOT_USER_NAME=$(echo $SECRETS | jq -r '.ROOT_USER_NAME') | ||
| ROOT_USER_PASS=$(echo $SECRETS | jq -r '.ROOT_USER_PASS') | ||
|
|
||
| : "${ACCOUNT_NAME:?Need and root user name for Drupal}" | ||
| : "${ACCOUNT_PASS:?Need and root user pass for Drupal}" | ||
|
|
||
| drupal site:install \ | ||
| --root=$HOME/web \ | ||
| --no-interaction \ | ||
| --account-name="$ROOT_USER_NAME" \ | ||
| --account-pass="$ROOT_USER_PASS" \ | ||
| --langcode="en" | ||
| # Delete some data created in the "standard" install profile | ||
| # See https://www.drupal.org/project/drupal/issues/2583113 | ||
| drupal --root=$HOME/web entity:delete shortcut_set default --no-interaction | ||
| # Set site uuid to match our config | ||
| UUID=$(grep uuid web/sites/default/config/system.site.yml | cut -d' ' -f2) | ||
| drupal --root=$HOME/web config:override system.site uuid $UUID | ||
| } | ||
|
|
||
| if [ "${CF_INSTANCE_INDEX:-''}" == "0" ]; then | ||
| drupal --root=$HOME/web list | grep database > /dev/null || install_drupal | ||
| # Sync configs from code | ||
| drupal --root=$HOME/web config:import --directory $HOME/web/sites/default/config | ||
|
|
||
| # Secrets | ||
| CRON_KEY=$(openssl rand -base64 32) # Not used, so we set it to a random val | ||
| BRIGHTCOVE_ACCOUNT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_ACCOUNT') | ||
| BRIGHTCOVE_CLIENT=$(echo $SECRETS | jq -r '.BRIGHTCOVE_CLIENT') | ||
| BRIGHTCOVE_SECRET=$(echo $SECRETS | jq -r '.BRIGHTCOVE_SECRET') | ||
| drupal --root=$HOME/web config:override scheduler.settings lightweight_cron_access_key $CRON_KEY > /dev/null | ||
| drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove account_id $BRIGHTCOVE_ACCOUNT > /dev/null | ||
| drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove client_id $BRIGHTCOVE_CLIENT > /dev/null | ||
| drupal --root=$HOME/web config:override brightcove.brightcove_api_client.nsf_brightcove secret_key $BRIGHTCOVE_SECRET > /dev/null | ||
|
|
||
| # Clear the cache | ||
| drupal --root=$HOME/web cache:rebuild --no-interaction | ||
| fi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,88 @@ | ||
| { | ||
| "name": "18f/nsf", | ||
| "description": "The National Science Foundation's beta site", | ||
| "type": "project", | ||
| "license": "GPL-2.0+", | ||
| "authors": [ | ||
| { | ||
| "name": "", | ||
| "role": "" | ||
| } | ||
| ], | ||
| "repositories": [ | ||
| { | ||
| "type": "composer", | ||
| "url": "https://packages.drupal.org/8" | ||
| } | ||
| ], | ||
| "require": { | ||
| "php": "^7.1.0", | ||
| "composer/installers": "^1.2", | ||
| "cweagans/composer-patches": "^1.6", | ||
| "drupal-composer/drupal-scaffold": "^2.2", | ||
| "drupal/bootstrap": "^3.11", | ||
| "drupal/brightcove": "^1.3", | ||
| "drupal/console": "^1.0.2", | ||
| "drupal/core": "~8.4", | ||
| "drupal/ctools": "^3.0", | ||
| "drupal/devel": "^1.2", | ||
| "drupal/diff": "^1.0@RC", | ||
| "drupal/embed": "^1.0", | ||
| "drupal/entity_browser": "^2.0", | ||
| "drupal/entity_embed": "^1.0@beta", | ||
| "drupal/features": "^3.5", | ||
| "drupal/flysystem_s3": "^1.0@alpha", | ||
| "drupal/inline_entity_form": "^1.0@beta", | ||
| "drupal/masquerade": "^2.0@beta", | ||
| "drupal/media_entity": "^1.7", | ||
| "drupal/pathauto": "^1.1", | ||
| "drupal/rules": "^3.0@alpha", | ||
| "drupal/scheduler": "^1.0", | ||
| "drupal/time_formatter": "1.x-dev", | ||
| "drupal/tour_ui": "^1.0@alpha", | ||
| "drupal/workflow": "^1.0", | ||
| "drush/drush": "~8.0|^9.0.0-beta8", | ||
| "webflo/drupal-finder": "^1.0.0", | ||
| "webmozart/path-util": "^2.3" | ||
| }, | ||
| "conflict": { | ||
| "drupal/drupal": "*" | ||
| }, | ||
| "minimum-stability": "dev", | ||
| "prefer-stable": true, | ||
| "config": { | ||
| "sort-packages": true | ||
| }, | ||
| "autoload": { | ||
| "classmap": [ | ||
| "scripts/composer/ScriptHandler.php" | ||
| ] | ||
| }, | ||
| "scripts": { | ||
| "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold", | ||
| "pre-install-cmd": [ | ||
| "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" | ||
| ], | ||
| "pre-update-cmd": [ | ||
| "DrupalProject\\composer\\ScriptHandler::checkComposerVersion" | ||
| ], | ||
| "post-install-cmd": [ | ||
| "DrupalProject\\composer\\ScriptHandler::createRequiredFiles" | ||
| ], | ||
| "post-update-cmd": [ | ||
| "DrupalProject\\composer\\ScriptHandler::createRequiredFiles" | ||
| ] | ||
| }, | ||
| "extra": { | ||
| "installer-paths": { | ||
| "web/core": ["type:drupal-core"], | ||
| "web/libraries/{$name}": ["type:drupal-library"], | ||
| "web/modules/contrib/{$name}": ["type:drupal-module"], | ||
| "web/profiles/contrib/{$name}": ["type:drupal-profile"], | ||
| "web/themes/contrib/{$name}": ["type:drupal-theme"], | ||
| "web/drush/contrib/{$name}": ["type:drupal-drush"], | ||
| "web/modules/custom/{$name}": ["type:drupal-custom-module"], | ||
| "web/themes/custom/{$name}": ["type:drupal-custom-theme"] | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For later: there's a deployment consideration here -- we could include these dirs in the cf deployment (i.e. vendor our dependencies). That'd ensure consistency and slightly speed up restages at the cost of high likelihood of error (e.g. sending up something compiled for OSX).