Merge branch 'develop' of https://github.com/ngageoint/mage-server into kmz-upload

Author: ryanslatten

.github/workflows/aws_dev.deploy.yaml

@@ -26,7 +26,7 @@ jobs:
           fi
 
       - name: AWS config
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.AWS_DEV_ROLE }}
           role-session-name: GithubNGAGeointSession
@@ -39,18 +39,17 @@ jobs:
       - name: Build Docker image
         env:
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
-          REPOSITORY: "/mage/server"
+          REPOSITORY: "/mage"
           IMAGE_TAG: ${{ env.IMAGE_TAG }}
         run: |
           docker build -t $REGISTRY$REPOSITORY:$IMAGE_TAG .
 
-      - name: Push Image and ReDeploy ECS Service
+      - name: Push Image
         if: github.ref =='refs/heads/test' || github.ref =='refs/heads/develop'
         env:
           SERVICE: "mage${{ env.IMAGE_TAG }}"
           REGISTRY: ${{ steps.ecr-login.outputs.registry }}
-          REPOSITORY: "/mage/server"
+          REPOSITORY: "/mage"
           IMAGE_TAG: ${{ env.IMAGE_TAG }}
         run: |
           docker push $REGISTRY$REPOSITORY:$IMAGE_TAG
-          aws ecs update-service --cluster magedev --service $SERVICE --force-new-deployment

.github/workflows/release.yaml

@@ -128,12 +128,12 @@ jobs:
       - name: publish mage service
         run: |
           npm config set -- '//registry.npmjs.org/:_authToken' ${{ secrets.NPM_TOKEN }}
-          npm publish --access public $(ls -1 ngageoint-mage.service-*.tgz) || echo "skipping mage service publish..."
+          npm publish --access public $(ls -1 ngageoint-mage.service-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage service publish..."
       - name: publish mage web
         run: |
           npm config set -- '//registry.npmjs.org/:_authToken' ${{ secrets.NPM_TOKEN }}
-          npm publish --access public $(ls -1 ngageoint-mage.web-app-*.tgz) || echo "skipping mage web app publish..."
+          npm publish --access public $(ls -1 ngageoint-mage.web-app-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage web app publish..."
       - name: publish mage core
         run: |
           npm config set -- '//registry.npmjs.org/:_authToken' ${{ secrets.NPM_TOKEN }}
-          npm publish --access public $(ls -1 ngageoint-mage.web-core-lib-*.tgz) || echo "skipping mage core publish..."
+          npm publish --access public $(ls -1 ngageoint-mage.web-core-lib-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage core publish..."

docker/server/Dockerfile

@@ -1,4 +1,10 @@
 FROM registry1.dso.mil/ironbank/opensource/nodejs/debian/nodejs:20.11.1
+ARG SERVICE_VERSION=6.4.0-beta.1
+ARG WEB_VERSION=6.4.0-beta.1
+ARG ARC_SERVICE_VERSION=1.0.0-beta.2
+ARG ARC_WEB_VERSION=1.0.0-beta.2
+ARG SFTP_SERVICE_VERSION=1.0.0-beta.2
+ARG SFTP_WEB_VERSION=1.0.0-beta.2
 
 LABEL author="NGA"
 
@@ -15,12 +21,12 @@ USER mage
 ENV MAGE_HOME=/home/mage/instance
 WORKDIR ${MAGE_HOME}
 RUN ls -l \
-    && 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.2 \
-    && npm i --omit dev @ngageoint/mage.arcgis.web-app@1.0.0-beta.2 \
-    && npm i --omit dev @ngageoint/mage.sftp.service@1.0.0-beta.2 \
-    && npm i --omit dev @ngageoint/mage.sftp.web@1.0.0-beta.2 \
+    && npm i --omit dev @ngageoint/mage.service@${SERVICE_VERSION} \
+    && npm i --omit dev @ngageoint/mage.web-app@${WEB_VERSION} \
+    && if [ "$ARC_SERVICE_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.arcgis.service@$ARC_SERVICE_VERSION; fi\
+    && if [ "$ARC_WEB_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.arcgis.web-app@$ARC_WEB_VERSION; fi \
+    && if [ "$SFTP_SERVICE_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.sftp.service@$SFTP_SERVICE_VERSION; fi \
+    && if [ "$SFTP_WEB_VERSOIN" != "NONE" ]; then npm i --omit dev @ngageoint/mage.sftp.web@$SFTP_WEB_VERSION; fi \
     && ln -s ./node_modules/.bin/mage.service
 
 VOLUME /var/lib/mage

instance/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngageoint/mage.dev-instance",
-  "version": "6.3.0",
+  "version": "6.4.0-beta.1",
   "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",

package-lock.json

@@ -2,7 +2,7 @@
   "name": "@ngageoint/mage.project",
   "description": "This is the root package definition for the mage-server monorepo.",
   "private": true,
-  "version": "6.3.0",
+  "version": "6.4.0-beta.1",
   "files": [],
   "scripts": {
     "postinstall": "npm-run-all service:ci web-app:ci arcgis:ci sftp:ci",