Skip to content

Commit b272e6c

Browse files
committed
6.1.0 release
1 parent 068edd8 commit b272e6c

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ MAGE adheres to [Semantic Versioning](http://semver.org/).
99

1010
##### Bug Fixes
1111

12+
## [6.1.0](https://github.com/ngageoint/mage-server/releases/tag/6.1.0)
13+
14+
##### Features
15+
* You can now enter and display all coordinates in the app in Degree Minute Second format.
16+
* Administrators can now allow for any attachment types, or restrict to image, video or audio.
17+
18+
##### Bug Fixes
19+
* Textarea in observation form is resizeable.
20+
* User and team paging api update, fixes team and event size limitation.
21+
1222
## [6.0.2](https://github.com/ngageoint/mage-server/releases/tag/6.0.2)
1323

1424
##### Features

docker/README.md

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

docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ services:
1717

1818
mage-server:
1919
depends_on: [mage-db]
20-
image: "mage-server:${MAGE_VERSION:-6.0.2}"
20+
image: "mage-server:${MAGE_VERSION:-6.1.0}"
2121
# image: "mage-server:debug"
2222
build:
2323
context: ./server
2424
# dockerfile: Dockerfile-debug
2525
args:
26-
MAGE_VERSION: "${MAGE_VERSION:-6.0.2}"
26+
MAGE_VERSION: "${MAGE_VERSION:-6.1.0}"
2727
volumes:
2828
- ./server/resources:/var/lib/mage
2929
- ..:/home/mage/mage-server

docker/server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM node:14.17.5
22

3-
ARG MAGE_VERSION=6.0.2
3+
ARG MAGE_VERSION=6.1.0
44

55
LABEL author="NGA"
66

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mage-server",
3-
"version": "6.0.2",
3+
"version": "6.1.0",
44
"displayName": "MAGE Server",
55
"description": "Geospatial situation awareness application.",
66
"keywords": [

web-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngageoint/mage-web",
3-
"version": "6.0.2",
3+
"version": "6.1.0",
44
"description": "MAGE Web",
55
"keywords": [
66
"NGA",

0 commit comments

Comments
 (0)