Merge pull request #734 from USEPA/main

Cutting new tag

.buildkite/pipeline.yml

@@ -16,7 +16,9 @@ steps:
     if:
       build.branch != "integration" &&
       build.branch != "main" &&
-      build.branch != "release"
+      build.branch != "release" &&
+      build.branch != "live" &&
+      build.branch != "EPAD8-1705-USWDS-3"
 
     command: buildkite-agent pipeline upload .buildkite/feature.yml
     env:
@@ -42,17 +44,30 @@ steps:
   # is skipped, this wait incurs no penalty.
   - wait: ~
 
-  # For each of the three branches we deploy (integration, main, and release),
-  # run the webcms.yml pipeline.
+  # For each of the branches we deploy, run the webcms.yml pipeline. (See below
+  # for the USWDS environment.)
   - label: ":pipeline: WebCMS (${BUILDKITE_BRANCH})"
     if:
       build.pull_request.id == null && (
         build.branch == "integration" ||
         build.branch == "main" ||
-        build.branch == "release"
+        build.branch == "release" ||
+        build.branch == "live"
       )
 
     command: buildkite-agent pipeline upload .buildkite/webcms.yml
     env:
       WEBCMS_ENVIRONMENT: preproduction
       WEBCMS_SITE: ${BUILDKITE_BRANCH}
+
+  # The USWDS environment gets deployed from a branch where WEBCMS_SITE doesn't
+  # match up, so we handle it specially here.
+  - label: ":pipeline: WebCMS (uswds)"
+    if:
+      build.pull_request.id == null &&
+      build.branch == "EPAD8-1705-USWDS-3"
+
+    command: buildkite-agent pipeline upload .buildkite/webcms.yml
+    env:
+      WEBCMS_ENVIRONMENT: preproduction
+      WEBCMS_SITE: uswds

services/drupal/.env.example

@@ -7,6 +7,8 @@ WEBCMS_HASH_SALT=abcdefg
 WEBCMS_S3_BUCKET=drupal
 WEBCMS_S3_REGION=us-east-1
 
+WEBCMS_CF_DISTRIBUTIONID=abcdef
+
 WEBCMS_LOG_GROUP=/webcms-local/app-drupal
 
 WEBCMS_DB_HOST=mysql

services/drupal/Dockerfile

@@ -292,7 +292,9 @@ RUN docker-php-ext-enable memcached
 RUN f1-ext-install pecl:apcu builtin:sockets \
   && apk add --no-cache \
   # Needed by the Elasticache memcached client
-  libstdc++
+  libstdc++ \
+  # See ENTRYPOINT below
+  tini
 
 # Allow unlimited memory usage when running Drush tasks (ECS will constrain the memory
 # instead of PHP)
@@ -312,4 +314,10 @@ RUN chmod +x /usr/local/bin/drush-migrate
 COPY scripts/ecs/drupal-entrypoint.sh /webcms-entrypoint
 RUN chmod +x /webcms-entrypoint
 
-ENTRYPOINT ["/webcms-entrypoint"]
+# Replace the default crontab with one that runs Drush every five minutes. By
+# default, cron is not run (since there is no systemd equivalent in containers),
+# but we use this in the Drush ECS service definition.
+RUN echo '*/5 * * * * drush cron 2>&1' | crontab -
+
+# Wrap the entrypoint script with tini to allow graceful signal handling
+ENTRYPOINT ["tini", "--", "/webcms-entrypoint"]

services/drupal/composer.json

@@ -213,7 +213,6 @@
         "drupal/address": "^1.7",
         "drupal/addtocal": "^1.1",
         "drupal/admin_toolbar": "^2.0",
-        "drupal/akamai": "dev-3.x#d4e4c8167332c8cce4f65716683cfec64d1dae38",
         "drupal/allowed_formats": "^1.3",
         "drupal/anchor": "^1.0",
         "drupal/auto_entitylabel": "^3.0@beta",
@@ -225,6 +224,7 @@
         "drupal/ckeditor_resize": "^1.3",
         "drupal/ckeditor_specialchars": "^1.2",
         "drupal/ckeditorheight": "^1.8",
+        "drupal/cloudfront_cache_path_invalidate": "^2.2",
         "drupal/components": "^2.0",
         "drupal/config_filter": "^1.8",
         "drupal/config_ignore": "^2.3",
@@ -234,7 +234,6 @@
         "drupal/core-composer-scaffold": "~9.3.0",
         "drupal/core-recommended": "~9.3.0",
         "drupal/cshs": "^3.5",
-        "drupal/csv_serialization": "^1.5",
         "drupal/default_content": "^1.0-alpha9",
         "drupal/devel": "^4.0",
         "drupal/diff": "^1.0",
@@ -291,7 +290,6 @@
         "drupal/path_redirect_import": "^1.0@beta",
         "drupal/pathauto": "^1.4",
         "drupal/pathologic": "^1.0-alpha2",
-        "drupal/purge": "^3.0",
         "drupal/queue_ui": "^2.2",
         "drupal/rabbit_hole": "^1.0-beta10",
         "drupal/redirect": "^1.6",
@@ -338,7 +336,7 @@
         "jsq/amazon-es-php": "^0.3.0",
         "kint-php/kint": "^3.3",
         "liuggio/statsd-php-client": "^1.0",
-        "nodespark/des-connector": "dev-php-update as 7.x-dev",
+        "nodespark/des-connector": "dev-php-update#d699e59 as 7.x-dev",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",