Skip to content

Commit

Permalink
Merge branch 'main' into live
Browse files Browse the repository at this point in the history
  • Loading branch information
azinck committed Feb 1, 2023
2 parents eb58a4a + e7f184a commit af5fd09
Show file tree
Hide file tree
Showing 355 changed files with 8,551 additions and 1,328 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Note: this has only been tested on ddev 1.19 and above.
ddev aws-setup
```

3. After that, please download the latest database and put it in the `services/drupal/.ddev/db/` folder. The filename isn't important; you will be prompted to select the DB you wish to import during the next step.
3. After that, please download the latest database (see https://forumone.atlassian.net/wiki/spaces/EPA/pages/1794637894/HOWTO+Import+D8+InnoDB+Cold+Backup) and put the .tar file in the `services/drupal/.ddev/db/` folder. The filename isn't important; you will be prompted to select the DB you wish to import during the next step.

4. Import the database by running:

Expand Down Expand Up @@ -53,6 +53,9 @@ Note: this has only been tested on ddev 1.19 and above.
```````
10. Install Drupal from config (or restore a backup). You can install from config by running:
**Note**: Do not run this command if starting from a new installation. This will wipe the database out, instead skip to #11.
```
ddev drush si --existing-config
```
Expand Down
7 changes: 7 additions & 0 deletions services/drupal/.ddev/commands/web/phpcbf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

## Description: Runs phpcbf
## Usage: phpcbf
## Example: "ddev phpcbf"

phpcbf "$@"
7 changes: 7 additions & 0 deletions services/drupal/.ddev/commands/web/phpcs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

## Description: Runs phpcs
## Usage: phpcs
## Example: "ddev phpcs"

phpcs "$@"
7 changes: 7 additions & 0 deletions services/drupal/.ddev/commands/web/phpstan
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/sh

## Description: Runs PHPStan.
## Usage: phpstan
## Example: "ddev phpstan"

phpstan "$@"
2 changes: 1 addition & 1 deletion services/drupal/.ddev/docker-compose.localstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
image: localstack/localstack:0.12.10
networks: [default, ddev_default]
expose:
- 4566:4566
- 4566
environment:
LOCALSTACK_SERVICES: logs
LOCALSTACK_START_WEB: '0'
Expand Down
2 changes: 1 addition & 1 deletion services/drupal/.ddev/docker-compose.mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
MYSQL_PASSWORD: web
MYSQL_DATABASE: web
expose:
- 13306:3306
- 3306
volumes:
- ./db:/var/db
- ".:/mnt/ddev_config"
Expand Down
27 changes: 27 additions & 0 deletions services/drupal/.phpcs.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0"?>
<ruleset name="drupal_project">
<description>PHP_CodeSniffer standards for Drupal-based projects.</description>

<!-- Use default Drupal coding standards. -->
<rule ref="Drupal" />
<rule ref="DrupalPractice" />
<arg name="extensions" value="inc,install,module,php,profile,test,theme"/>
<!-- Scan within this directory. -->
<file>.</file>

<exclude-pattern>vendor/*</exclude-pattern>
<exclude-pattern>drush/*</exclude-pattern>
<exclude-pattern>tests/*</exclude-pattern>
<exclude-pattern>node_modules/*</exclude-pattern>
<exclude-pattern>web/core/*</exclude-pattern>
<exclude-pattern>web/libraries/*</exclude-pattern>
<exclude-pattern>web/modules/contrib/*</exclude-pattern>
<exclude-pattern>web/profiles/contrib/*</exclude-pattern>
<exclude-pattern>web/themes/contrib/*</exclude-pattern>
<exclude-pattern>web/sites/*/files/*</exclude-pattern>
<exclude-pattern>load.environment.php</exclude-pattern>
<exclude-pattern>.ddev/*</exclude-pattern>
<exclude-pattern>scripts/*</exclude-pattern>
<exclude-pattern>web/private/*</exclude-pattern>
<exclude-pattern>web/sites/default/*</exclude-pattern>
</ruleset>
6 changes: 6 additions & 0 deletions services/drupal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@ COPY status.conf *.map /etc/nginx/conf.d/
# Copy configuration templates
COPY default.conf /etc/nginx/templates/default.conf.template

# Copy nginx startup script
COPY scripts/ecs/nginx-entrypoint.sh /webcms-entrypoint

ENTRYPOINT [ "/webcms-entrypoint" ]
CMD [ "nginx", "-g", "daemon off;" ]

# Build a drush-specific image: this image includes command-line utilities such as mysql
# and ssh that are inappropriate for a server container image.
FROM forumone/drupal8-cli:8.0 AS drush
Expand Down
48 changes: 39 additions & 9 deletions services/drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@
"drupal/autosave_form": "^1.3",
"drupal/block_content_permissions": "^1.8",
"drupal/block_list_override": "^1.0",
"drupal/ckeditor": "^1.0",
"drupal/ckeditor_abbreviation": "^2.0",
"drupal/ckeditor_iframe": "^2.1",
"drupal/ckeditor_resize": "^1.3",
Expand All @@ -231,35 +232,41 @@
"drupal/config_filter": "^1.8",
"drupal/config_ignore": "^2.3",
"drupal/config_split": "~1.5",
"drupal/content_moderation_notifications": "dev-3.x#7ffa936",
"drupal/content_moderation_notifications": "dev-3.x#9ab3da5",
"drupal/content_moderation_revert": "1.x-dev",
"drupal/core-composer-scaffold": "~9.3.0",
"drupal/core-recommended": "~9.3.0",
"drupal/core-composer-scaffold": "~9.4.7",
"drupal/core-recommended": "~9.4.7",
"drupal/cshs": "^3.5",
"drupal/default_content": "^1.0-alpha9",
"drupal/devel": "^4.0",
"drupal/diff": "^1.0",
"drupal/duration_field": "^2.0",
"drupal/editor_advanced_link": "^1.8",
"drupal/editoria11y": "^2.0",
"drupal/elasticsearch_connector": "^7.0-alpha3",
"drupal/embed": "^1.4",
"drupal/entity_browser": "^2.6",
"drupal/entity_clone": "^1.0@beta",
"drupal/entity_usage": "^2.0-beta3",
"drupal/entitygroupfield": "^1.0@alpha",
"drupal/environment_indicator": "^4.0",
"drupal/facets": "^1.4",
"drupal/facets_pretty_paths": "1.x-dev",
"drupal/environment_indicator": "^4.0.10",
"drupal/facets": "^2.0",
"drupal/facets_pretty_paths": "^1.4",
"drupal/fast_404": "^2.0@alpha",
"drupal/field_group": "^3.0",
"drupal/filter_html_plus": "^1.0-alpha2",
"drupal/fixed_block_content": "^1.1",
"drupal/flag": "^4.0@beta",
"drupal/flood_control": "^2.1",
"drupal/focal_point": "^1.5",
"drupal/gin": "^3.0",
"drupal/gin_lb": "^1.0@beta",
"drupal/gin_toolbar": "^1.0@beta",
"drupal/group": "^1.2",
"drupal/group_content_menu": "^1.0",
"drupal/group_outsider_in": "^1.0-beta1",
"drupal/groupmedia": "^2.0@alpha",
"drupal/hal": "~1.0.0",
"drupal/hierarchical_term_formatter": "^1.2",
"drupal/honeypot": "^2.0",
"drupal/image_style_quality": "^1.4",
Expand Down Expand Up @@ -298,9 +305,11 @@
"drupal/redirect": "^1.6",
"drupal/redirect_metrics": "^1.0@RC",
"drupal/role_expose": "^2.0",
"drupal/role_theme_switcher": "^1.2",
"drupal/s3fs": "^3.0@beta",
"drupal/samlauth": "^3.0",
"drupal/scheduled_publish": "^3.9",
"drupal/schema_metatag": "^2.3",
"drupal/search_api": "^1.27",
"drupal/seckit": "^2.0",
"drupal/shield": "1.x-dev",
Expand Down Expand Up @@ -341,14 +350,21 @@
"kint-php/kint": "^3.3",
"liuggio/statsd-php-client": "^1.0",
"nodespark/des-connector": "dev-php-update#d699e59 as 7.x-dev",
"ruflin/elastica": "7.x-dev#72a4598544e3f99b5dd8cacb05d009ee75c2a701 as dev-master",
"vlucas/phpdotenv": "^2.4",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
"wikimedia/composer-merge-plugin": "^2.0",
"zaporylie/composer-drupal-optimizations": "^1.0"
},
"require-dev": {
"drupal/core-dev": "~9.3.0"
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"drupal/core-dev": "~9.4.7",
"mglaman/phpstan-drupal": "^1.1",
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.9",
"phpstan/phpstan-deprecation-rules": "^1.1",
"squizlabs/php_codesniffer": "^3.7"
},
"conflict": {
"drupal/drupal": "*"
Expand All @@ -370,7 +386,8 @@
"drupal/core-composer-scaffold": true,
"zaporylie/composer-drupal-optimizations": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"wikimedia/composer-merge-plugin": true
"wikimedia/composer-merge-plugin": true,
"phpstan/extension-installer": true
}
},
"autoload": {
Expand All @@ -380,8 +397,21 @@
"files": ["load.environment.php"]
},
"scripts": {
"install-codestandards": [
"PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
],
"php-stan": [
"./vendor/bin/phpstan"
],
"phpcs": [
"./vendor/bin/phpcs"
],
"phpcbf": [
"./vendor/bin/phpcbf"
],
"post-install-cmd": [
"DrupalProject\\composer\\ScriptHandler::createFilesDir"
"DrupalProject\\composer\\ScriptHandler::createFilesDir",
"@install-codestandards"
],
"post-update-cmd": [
"DrupalProject\\composer\\ScriptHandler::createFilesDir"
Expand Down
Loading

0 comments on commit af5fd09

Please sign in to comment.