Merge branch 'release/2.2.5' into craft-webpack

CHANGELOG.md

@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.2.5 - 2020.03.27
+### Changed
+* Synced up the `project.yaml` with the `seed_db.sql` so it can properly propagate
+* Added a default `SECURITY_KEY` in `example.env`
+
 ## 2.2.4 - 2020.03.27
 ### Changed
 * Skip a superfluous copy operation in the Nginx container

README.md

@@ -53,9 +53,9 @@ You'll need Docker desktop for your platform installed to run the project in loc
 
 * Set up a `.env` file in the `cms/` directory, based off of the provided `example.env`
 * Set up a `.env.sh.` file in the `scripts/` directory, based off of the provided `example.env.sh`
-* Start up the site with `docker-composer up` (the first build will be somewhat lengthy)
+* Start up the site with `docker-compose up` (the first build will be somewhat lengthy)
 * On the first time setting it up, the `craft_php_1` container will fail; this is normal
-* Import the `seed_db.sql` database dump the first time from the `scripts/` dir with `./docker_restore)db.sh seed_db.sql`
+* Import the `seed_db.sql` database dump the first time from the `scripts/` dir with `./docker_restore_db.sh seed_db.sql`
 * Then hit ^C (Control-C) to stop the Docker containers, and restart them with `docker-compose up` and `craft_php_1` should then work properly, since the db has been seeded
 * Navigate to `http://localhost:8000` to use the site; the `webpack-dev-server` runs off of `http://localhost:8080`
 

cms/config/project.yaml

@@ -6,7 +6,7 @@ email:
 fieldGroups:
   d08a0d16-0e00-49e6-9cd4-465fa2d65d7d:
     name: Errors
-  efc44cb8-5a29-4f4b-8977-cf6ee112e601:
+  94b4d5ac-d7ea-4241-a6cb-92b39f482f99:
     name: Common
 fields:
   a5cb77be-c4d9-4d3e-88fb-d5384ca13941:
@@ -132,7 +132,7 @@ plugins:
     edition: standard
     enabled: true
     licenseKey: $PLUGIN_RETOUR_LICENSE
-    schemaVersion: 3.0.7
+    schemaVersion: 3.0.9
   seomatic:
     edition: standard
     enabled: true
@@ -159,7 +159,7 @@ sections:
     enableVersioning: false
     propagationMethod: all
     siteSettings:
-      66514b58-f1c7-480d-b3d5-aca0b7d78f45:
+      5da841b1-ca0d-46ff-8bb1-04d6c889ac54:
         enabledByDefault: true
         hasUrls: true
         uriFormat: __home__
@@ -179,7 +179,7 @@ sections:
     enableVersioning: false
     propagationMethod: all
     siteSettings:
-      66514b58-f1c7-480d-b3d5-aca0b7d78f45:
+      5da841b1-ca0d-46ff-8bb1-04d6c889ac54:
         enabledByDefault: true
         hasUrls: false
         uriFormat: null
@@ -193,23 +193,23 @@ sections:
         titleFormat: null
         sortOrder: 1
 siteGroups:
-  29a5becc-aa82-4ea8-a790-5056591e422d:
+  f89601e9-4ba9-4a48-9e99-350aa9914912:
     name: $SITE_NAME
 sites:
-  66514b58-f1c7-480d-b3d5-aca0b7d78f45:
+  5da841b1-ca0d-46ff-8bb1-04d6c889ac54:
     name: $SITE_NAME
     handle: default
     language: en-US
     hasUrls: true
     baseUrl: $SITE_URL
     sortOrder: 1
     primary: true
-    siteGroup: 29a5becc-aa82-4ea8-a790-5056591e422d
+    siteGroup: f89601e9-4ba9-4a48-9e99-350aa9914912
 system:
   edition: solo
   name: $SITE_NAME
   live: true
-  schemaVersion: 3.2.16
+  schemaVersion: 3.4.10
   timeZone: America/New_York
 users:
   requireEmailVerification: true

cms/example.env

@@ -7,7 +7,7 @@ ENABLE_TEMPLATE_CACHING=0
 ENVIRONMENT=dev
 IS_SYSTEM_LIVE=1
 RUN_QUEUE_AUTOMATICALLY=1
-SECURITY_KEY=
+SECURITY_KEY=EOdiVBONceb8zFGJP7InMui2pMkvNACz
 SITE_NAME=
 
 # Craft database settings

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "keywords": [
     "craft",
     "cms",