Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@ MAGE adheres to [Semantic Versioning](http://semver.org/).
- Protect against disabling all authentications.
- Problem with OAuth web login

## [6.3.0](https://github.com/ngageoint/mage-server/releases/tag/6.3.0)
### Service
#### Features
* ArcGIS Plugin support
* SFTP Plugin Support
* Support for MongoDB 6.0
* Dependency updates
### Web App
#### Features
* ArcGIS Plugin support
* SFTP Plugin Support
* Moved authentication settings to own admin tab
* Redirect host added for saml config
* Fix for issue with arabic characters in filenames
* Fix for observation filter options
* Dependency updates
* Map UI updates

## [6.2.13](https://github.com/ngageoint/mage-server/releases/tag/6.2.13)
### Service
#### Features
Expand Down
16 changes: 6 additions & 10 deletions docker/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,19 @@ USER mage
ENV MAGE_HOME=/home/mage/instance
WORKDIR ${MAGE_HOME}
RUN ls -l \
&& npm i --omit dev @ngageoint/mage.service@6.3.0-beta.8 \
&& npm i --omit dev @ngageoint/mage.web-app@6.3.0-beta.8 \
&& npm i --omit dev @ngageoint/mage.service@6.3.0 \
&& npm i --omit dev @ngageoint/mage.web-app@6.3.0 \
&& npm i --omit dev @ngageoint/mage.arcgis.service@1.0.0-beta.1 \
&& npm i --omit dev @ngageoint/mage.arcgis.web-app@1.0.0 \
&& npm i --omit dev @ngageoint/mage.sftp.service@1.0.0-beta.1 \
&& npm i --omit dev @ngageoint/mage.sftp.web@1.0.0-beta.1 \
&& npm i --omit dev @ngageoint/mage.nga-msi@1.0.5 \
&& npm i --omit dev @ngageoint/mage.image.service@1.1.0-beta.2 \
&& ln -s ./node_modules/.bin/mage.service

VOLUME /var/lib/mage
EXPOSE 4242

ENTRYPOINT [ "./mage.service", \
"--plugin", "@ngageoint/mage.arcgis.service", \
"--plugin", "@ngageoint/mage.sftp.service", \
"--plugin", "@ngageoint/mage.nga-msi", \
"--plugin", "@ngageoint/mage.image.service", \
"--web-plugin", "@ngageoint/mage.arcgis.web-app", \
"--web-plugin", "@ngageoint/mage.sftp.web"]
"--plugin", "@ngageoint/mage.arcgis.service", \
"--plugin", "@ngageoint/mage.sftp.service", \
"--web-plugin", "@ngageoint/mage.arcgis.web-app", \
"--web-plugin", "@ngageoint/mage.sftp.web"]
4 changes: 2 additions & 2 deletions instance/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngageoint/mage.dev-instance",
"version": "6.3.0-beta.8",
"version": "6.3.0",
"description": "Assemble a MAGE Server deployment from the core service, the web-app, and selected plugins. This is primarily a development tool because the dependencies point to relative directories instead of production packages. This can however serve as a starting point to create a production MAGE instance package.json.",
"scripts": {
"start": "npm run start:dev",
Expand Down Expand Up @@ -31,4 +31,4 @@
"@ngageoint/mage.service": "../service",
"@ngageoint/mage.web-app": "../web-app/dist"
}
}
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 4 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
"name": "@ngageoint/mage.project",
"description": "This is the root package definition for the mage-server monorepo.",
"private": true,
"version": "6.3.0-beta.8",
"version": "6.3.0",
"files": [],
"scripts": {
"postinstall": "npm-run-all service:ci web-app:ci arcgis:ci sftp:ci",
"install:resolve": "npm-run-all service:install web-app:install",
"build": "npm-run-all service:build web-app:build instance:build",
"build-all": "npm-run-all build arcgis:build sftp:build",

"pack-all": "npm-run-all service:pack web-app:pack image.service:pack nga-msi:pack",
"service:install": "npm install --prefix service",
"service:ci": "npm ci --prefix service",
Expand All @@ -24,21 +23,18 @@
"instance:start-config": "npm run start:dev --prefix instance",
"instance:start-env": "npm run start:dev-env --prefix instance",
"instance:start": "npm run start --prefix instance",

"arcgis:ci": "npm-run-all arcgis.service:ci arcgis.web-app:ci",
"arcgis.web-app:ci": "npm ci --prefix plugins/arcgis/web-app",
"arcgis.service:ci": "cd plugins/arcgis/service && npm ci && npm link ../../../service",
"arcgis:build":"npm-run-all arcgis.service:build arcgis.web-app:build",
"arcgis:build": "npm-run-all arcgis.service:build arcgis.web-app:build",
"arcgis.service:build": "npm run build --prefix plugins/arcgis/service",
"arcgis.web-app:build": "npm run build --prefix plugins/arcgis/web-app",

"sftp:ci": "npm-run-all sftp.service:ci sftp.web:ci",
"sftp.web:ci": "npm ci --prefix plugins/sftp/web",
"sftp.service:ci": "cd plugins/sftp/service && npm ci && npm link ../../../service",
"sftp:build": "npm-run-all sftp.service:build sftp.web:build",
"sftp.service:build": "npm run build --prefix plugins/sftp/service",
"sftp.web:build": "npm run build --prefix plugins/sftp/web",

"sftp.web:build": "npm run build --prefix plugins/sftp/web",
"image.service:install": "npm install --prefix plugins/image/service",
"image.service:ci": "npm ci --prefix plugins/image/service",
"image.service:build": "npm run build --prefix plugins/image/service",
Expand All @@ -47,12 +43,11 @@
"nga-msi:ci": "npm ci --prefix plugins/nga-msi",
"nga-msi:build": "npm run build --prefix plugins/nga-msi",
"nga-msi:pack": "npm pack ./plugins/nga-msi",

"start": "npm run instance:start",
"start-web": "npm run web-app:debug"
},
"devDependencies": {
"npm-run-all": "4.1.5"
},
"dependencies": {}
}
}
Loading