Prepare for 6.0 release

Author: newmanw

CHANGELOG.md

@@ -6,7 +6,18 @@ MAGE adheres to [Semantic Versioning](http://semver.org/).
 ## Pending on [`develop`](https://github.com/ngageoint/mage-server/tree/develop)
 
 ##### Features
-* Local user signup captcha.
+
+##### Bug Fixes
+
+## [6.0.0](https://github.com/ngageoint/mage-server/releases/tag/6.0.0)
+
+### Release Notes
+**This release includes database migrations, please remember to backup your database before upgrading.**
+
+##### Features
+* Multi form support. Users will be able to add multiple forms to an observation when the server configuration allows. Administrators can restrict total amount of forms, as well as min/max for individual forms.
+* Attachments are now form fields.  All existing forms will be migrated to include and "Attachments" form field as the first first field in each form.  Administrators can edit forms to include any number of attachments fields.  In addition administrators can restrict the number of attachments allowed in each field as well as the types of attachments.
+* Local user signup captcha.  All new local users will need to enter a captcha to create a local MAGE account.
 * New authentication functionality ability under admin->settings (e.g. create, edit, etc.).
 * Moving security settings to more secure location.
 * Adding support for connecting to a generic OAuth server.

docker/README.md

@@ -108,15 +108,15 @@ runs MongoDB as the service `mage-db`.
 The Compose file references a custom, local [Dockerfile](server/Dockerfile) based on the official [Node.js](https://hub.docker.com/_/node/)
 image to build the MAGE server image.  At build time, the MAGE server Dockerfile downloads an archive of the MAGE server
 code from [Github](https://github.com/ngageoint/mage-server).  This defaults to some (hopefully) recent release version of
-the MAGE server, e.g., 5.1.0.  The Dockerfile accepts an [argument](https://docs.docker.com/engine/reference/builder/#arg),
+the MAGE server, e.g., 6.0.0.  The Dockerfile accepts an [argument](https://docs.docker.com/engine/reference/builder/#arg),
 `MAGE_VERSION`, which you can specify to `docker-compose` like
 ```bash
 MAGE_VERSION=develop docker-compose build
 ```
 to build with whatever version of MAGE server you wish.  Github should accept any valid, uniquely identifiable refspec in
 the download URL the Docker file uses, so you could use a branch name, tag name, or commit hash.  By way of the
 ```yaml
-image: "mage-server:${MAGE_VERSION:-5.1.0}"
+image: "mage-server:${MAGE_VERSION:-6.0.0}"
 ```
 entry the Compose file tells Docker to [tag](https://docs.docker.com/get-started/part2/#tag-the-image) the `mage-server`
 image with value of `MAGE_VERSION`.
@@ -125,7 +125,7 @@ Be aware that every different value you specify for `MAGE_VERSION` to `docker-co
 `mage-server` image because changing that value modifies the [build stage](https://docs.docker.com/develop/develop-images/multistage-build/)
 that downloads the MAGE server baseline.  For example after running
 ```bash
-$ MAGE_VERSION=5.1.0 docker-compose build
+$ MAGE_VERSION=6.0.0 docker-compose build
 # ... Docker build output
 $ MAGE_VERSION=develop docker-compose build
 # ... Docker build output
@@ -134,7 +134,7 @@ then listing your Docker images ...
 ```bash
 $ docker images
 REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-mage-server         5.1.0               877f79a739b7        8 minutes ago       949MB
+mage-server         6.0.0               877f79a739b7        8 minutes ago       949MB
 mage-server         develop             75a73b7b7c3e        2 days ago          961MB
 node                8.11.1              4635bc7d130c        3 weeks ago         673MB
 mongo               3.6-jessie          5b1317f8158f        6 weeks ago         366MB

docker/docker-compose.yml

@@ -17,13 +17,13 @@ services:
 
   mage-server:
     depends_on: [mage-db]
-    image: "mage-server:${MAGE_VERSION:-6.0.0-beta3}"
+    image: "mage-server:${MAGE_VERSION:-6.0.0}"
     # image: "mage-server:debug"
     build:
       context: ./server
       # dockerfile: Dockerfile-debug
       args:
-        MAGE_VERSION: "${MAGE_VERSION:-6.0.0-beta3}"
+        MAGE_VERSION: "${MAGE_VERSION:-6.0.0}"
     volumes:
       - ./server/resources:/var/lib/mage
       - ..:/home/mage/mage-server
@@ -38,7 +38,7 @@ services:
       - mage.net
     environment:
       MAGE_MONGO_URL: mongodb://mage-db:27017/magedb
-      MAGE_TOKEN_EXPIRATION: "2419200"
+      MAGE_TOKEN_EXPIRATION: "28800"
 
   # Uncomment the following block to enable the TLS reverse proxy.  You will
   # also need to generate the key and certificate as the README describes.

docker/server/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:14.17.5
 
-ARG MAGE_VERSION=6.0.0-beta3
+ARG MAGE_VERSION=6.0.0
 
 LABEL author="NGA"
 

web-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngageoint/mage-web",
-  "version": "5.5.2",
+  "version": "6.0.0",
   "description": "MAGE Web",
   "keywords": [
     "NGA",