Merge pull request #5 from department-of-veterans-affairs/develop

VAGOV-1358 Merge from vagov

Dockerfile-database

@@ -1,10 +1,12 @@
 FROM mysql:5.7
 
+RUN apt-get update -y \
+  && apt-get install curl -y
 COPY docker/config/services/config/drupal8/mysql /etc/mysql/conf.d
 COPY docker/config/engine/scripts/lando-entrypoint.sh /lando-entrypoint.sh
 COPY . /app
 COPY docker/config /lando
-COPY drupal8-fixed.headless.gz /docker-entrypoint-initdb.d/dump.sql
+RUN curl -Lo /docker-entrypoint-initdb.d/db-latest.sql.gz https://s3-us-gov-west-1.amazonaws.com/agile6-backups-pub/mysql/db-latest.sql.gz
 COPY docker/config/engine/scripts/user-perms.sh /helpers/user-perms.sh
 COPY docker/config/engine/scripts/add-cert.sh /scripts/add-cert.sh
 COPY docker/config/engine/scripts/load-keys.sh /scripts/load-keys.sh

README.md

@@ -1,4 +1,4 @@
-This is a Lightning based implementation of D8 that uses lando for container management.
+This is a Lightning based implementation of Drupal 8 that uses [Lando](https://docs.devwithlando.io/) for local container management. 
 
 ## Get Started
 How to start:

composer.json

@@ -40,12 +40,14 @@
         "drupal/graphql": "^3.0@RC",
         "drupal/address": "^1.4",
         "drupal/node_title_help_text": "^1.0",
-        "drupal/field_group": "^1.0",
+        "drupal/field_group": "3.x-dev",
         "drupal/social_media_links": "^2.6",
         "weitzman/drupal-test-traits": "dev-master",
         "phpunit/phpunit": "^6",
         "drupal/redirect": "^1.3",
-        "michelf/php-markdown": "^1.8"
+        "michelf/php-markdown": "^1.8",
+        "drupal/cshs": "^1.0@beta",
+        "drupal/markup": "^1.0@beta"
     },
     "autoload": {
         "psr-4": {
@@ -125,6 +127,9 @@
             "drupal/migration_tools": {
                 "Add changeHtmlContents DomModifier method": "https://www.drupal.org/files/issues/2018-11-26/change_html_contents-3015381-3.patch"
             },
+            "drupal/field_group": {
+                "Allow to position the group in the advanced (sidebar) column": "https://www.drupal.org/files/issues/2018-07-26/2652642-59.patch"
+            },
             "acquia/headless_lightning": {
                 "Fix empty form id in redirect": "patches/nullFormIDFixInRedirect.patch"
             }