Skip to content

Commit e888726

Browse files
RyCarpenterRyCarpenter
authored
Merge pull request #360 from ngageoint/6.5.4
Release [6.5.5]
2 parents c845e0f + 01933ac commit e888726

File tree

363 files changed

+36334
-18935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+36334
-18935
lines changed

‎.github/workflows/aws_dev.deploy.yaml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.github/workflows/dev.container_build.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Dev Container Build
2+
3+
on:
4+
push:
5+
branches:
6+
- "**"
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: read
11+
packages: write
12+
13+
jobs:
14+
build-and-push:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout Repo
18+
uses: actions/checkout@v4
19+
20+
- name: Set IMAGE_TAG
21+
run: |
22+
if [[ "${{ github.ref_name }}" == "test" ]]; then
23+
echo "IMAGE_TAG=test" >> $GITHUB_ENV
24+
else
25+
echo "IMAGE_TAG=dev" >> $GITHUB_ENV
26+
fi
27+
28+
- name: Login to Github Registry ghcr.io
29+
uses: docker/login-action@v3
30+
with:
31+
registry: ghcr.io
32+
username: ${{ github.actor }}
33+
password: ${{ secrets.GITHUB_TOKEN }}
34+
35+
- name: Build Docker image
36+
run: |
37+
docker build -t ghcr.io/${{ github.repository }}/mage:$IMAGE_TAG .
38+
39+
- name: Push Image
40+
if: github.ref =='refs/heads/test' || github.ref =='refs/heads/develop'
41+
run: |
42+
docker push ghcr.io/${{ github.repository }}/mage:$IMAGE_TAG

‎.github/workflows/release.yaml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ on:
1818
required: false
1919
default: true
2020

21-
# TODO: possibly use release branches to perform the release process
22-
# push:
23-
# branches:
24-
# - release/*
25-
# - prerelease/*
26-
# TODO: possibly use release event to perform the release process
27-
# release:
28-
2921
jobs:
3022
config:
3123
uses: ./.github/workflows/config.yaml
@@ -110,11 +102,17 @@ jobs:
110102
name: publish packages
111103
needs: [config, create_release]
112104
runs-on: ubuntu-latest
105+
permissions:
106+
id-token: write
107+
contents: read
113108
steps:
114109
- name: setup node
115-
uses: actions/setup-node@v3
110+
uses: actions/setup-node@v4
116111
with:
117112
node-version: ${{ needs.config.outputs.node_versions-lts }}
113+
registry-url: "https://registry.npmjs.org"
114+
- name: update npm
115+
run: npm install -g npm@latest
118116
- name: install json util
119117
run: npm i -g json
120118
- name: download service packages
@@ -127,13 +125,10 @@ jobs:
127125
name: mage.web-app-artifacts
128126
- name: publish mage service
129127
run: |
130-
npm config set -- '//registry.npmjs.org/:_authToken' ${{ secrets.NPM_TOKEN }}
131-
npm publish --access public $(ls -1 ngageoint-mage.service-*.tgz) || echo "skipping mage service publish..."
128+
npm publish --access public $(ls -1 ngageoint-mage.service-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage service publish..."
132129
- name: publish mage web
133130
run: |
134-
npm config set -- '//registry.npmjs.org/:_authToken' ${{ secrets.NPM_TOKEN }}
135-
npm publish --access public $(ls -1 ngageoint-mage.web-app-*.tgz) || echo "skipping mage web app publish..."
131+
npm publish --access public $(ls -1 ngageoint-mage.web-app-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage web app publish..."
136132
- name: publish mage core
137133
run: |
138-
npm config set -- '//registry.npmjs.org/:_authToken' ${{ secrets.NPM_TOKEN }}
139-
npm publish --access public $(ls -1 ngageoint-mage.web-core-lib-*.tgz) || echo "skipping mage core publish..."
134+
npm publish --access public $(ls -1 ngageoint-mage.web-core-lib-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage core publish..."

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Change Log
22

33
All notable changes to this project will be documented in this file.
4-
MAGE adheres to [Semantic Versioning](http://semver.org/).
4+
Mage adheres to [Semantic Versioning](http://semver.org/).
55

66
---
77

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@ngageoint/mage

‎Dockerfile‎

Lines changed: 56 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ COPY service/package*.json ./
55
RUN npm install
66
COPY service/ ./
77
RUN npm run build
8-
98
RUN npm pack
109

1110
# Build web-app
@@ -16,83 +15,74 @@ COPY web-app/package*.json ./
1615
RUN npm install
1716
COPY web-app/ ./
1817
RUN npm run build
19-
2018
RUN npm pack ./dist
2119

22-
FROM node:20.11.1 AS build-arcwebplugin
23-
# Build arcgis service plugin
24-
WORKDIR /arcgiswebplugin
25-
COPY plugins/arcgis/web-app/package*.json ./
26-
RUN npm install
27-
COPY --from=build-service /service /arcgiswebplugin/node_modules/@ngageoint/mage.service
28-
COPY plugins/arcgis/web-app/ ./
29-
RUN npm run build
30-
RUN npm pack ./dist/main
20+
# FROM node:20.11.1 AS build-arcwebplugin
21+
# # Build arcgis service plugin
22+
# WORKDIR /arcgiswebplugin
23+
# COPY plugins/arcgis/web-app/package*.json ./
24+
# RUN npm install
25+
# COPY --from=build-service /service /arcgiswebplugin/node_modules/@ngageoint/mage.service
26+
# COPY plugins/arcgis/web-app/ ./
27+
# RUN npm run build
28+
# RUN npm pack ./dist/main
3129

32-
FROM node:20.11.1 AS build-arcserviceplugin
33-
WORKDIR /arcgisserviceplugin
34-
COPY plugins/arcgis/service/package*.json ./
35-
RUN npm install
36-
COPY --from=build-service /service /arcgisserviceplugin/node_modules/@ngageoint/mage.service
37-
COPY plugins/arcgis/service/ ./
38-
RUN npm run build
39-
RUN npm pack
30+
# FROM node:20.11.1 AS build-arcserviceplugin
31+
# WORKDIR /arcgisserviceplugin
32+
# COPY plugins/arcgis/service/package*.json ./
33+
# RUN npm install
34+
# COPY --from=build-service /service /arcgisserviceplugin/node_modules/@ngageoint/mage.service
35+
# COPY plugins/arcgis/service/ ./
36+
# RUN npm run build
37+
# RUN npm pack
4038

41-
FROM node:20.11.1 AS build-imageserviceplugin
42-
WORKDIR /imageserviceplugin
43-
COPY plugins/image/service/package*.json ./
44-
RUN npm install
45-
COPY --from=build-service /service /imageserviceplugin/node_modules/@ngageoint/mage.service
46-
RUN rm -rf /imageserviceplugin/node_modules/@ngageoint/mage.service/node_modules/mongoose
47-
COPY plugins/image/service/ ./
48-
RUN npm run build
49-
RUN npm pack
39+
# FROM node:20.11.1 AS build-imageserviceplugin
40+
# WORKDIR /imageserviceplugin
41+
# COPY plugins/image/service/package*.json ./
42+
# RUN npm install
43+
# COPY --from=build-service /service /imageserviceplugin/node_modules/@ngageoint/mage.service
44+
# RUN rm -rf /imageserviceplugin/node_modules/@ngageoint/mage.service/node_modules/mongoose
45+
# COPY plugins/image/service/ ./
46+
# RUN npm run build
47+
# RUN npm pack
5048

51-
FROM node:20.11.1 AS build-sftpserviceplugin
52-
WORKDIR /sftpserviceplugin
53-
COPY plugins/sftp/service/package*.json ./
54-
RUN npm install
55-
COPY --from=build-service /service /sftpserviceplugin/node_modules/@ngageoint/mage.service
56-
COPY plugins/sftp/service/ ./
57-
RUN npm run build
58-
RUN npm pack
49+
# FROM node:20.11.1 AS build-sftpserviceplugin
50+
# WORKDIR /sftpserviceplugin
51+
# COPY plugins/sftp/service/package*.json ./
52+
# RUN npm install
53+
# COPY --from=build-service /service /sftpserviceplugin/node_modules/@ngageoint/mage.service
54+
# COPY plugins/sftp/service/ ./
55+
# RUN npm run build
56+
# RUN npm pack
5957

60-
FROM node:20.11.1 AS build-sftpwebplugin
61-
# Build sftp service plugin
62-
WORKDIR /sftpwebplugin
63-
COPY plugins/sftp/web/package*.json ./
64-
RUN npm install
65-
COPY plugins/sftp/web/ ./
66-
RUN npm run build
67-
RUN npm pack ./dist/main
58+
# FROM node:20.11.1 AS build-sftpwebplugin
59+
# # Build sftp service plugin
60+
# WORKDIR /sftpwebplugin
61+
# COPY plugins/sftp/web/package*.json ./
62+
# RUN npm install
63+
# COPY plugins/sftp/web/ ./
64+
# RUN npm run build
65+
# RUN npm pack ./dist/main
6866

6967
# Build instance
7068
FROM node:20.11.1 AS build-instance
7169
COPY --from=build-service /service/ngageoint*.tgz /service/
7270
COPY --from=build-webapp /web-app/ngageoint*.tgz /web-app/
73-
COPY --from=build-arcwebplugin /arcgiswebplugin/ngageoint*.tgz /arcgiswebplugin/
74-
COPY --from=build-arcserviceplugin /arcgisserviceplugin/ngageoint*.tgz /arcgisserviceplugin/
75-
COPY --from=build-sftpserviceplugin /sftpserviceplugin/ngageoint*.tgz /sftpserviceplugin/
76-
COPY --from=build-sftpwebplugin /sftpwebplugin/ngageoint*.tgz /sftpwebplugin/
77-
COPY --from=build-imageserviceplugin /imageserviceplugin/ngageoint*.tgz /imageserviceplugin/
71+
# COPY --from=build-arcwebplugin /arcgiswebplugin/ngageoint*.tgz /arcgiswebplugin/
72+
# COPY --from=build-arcserviceplugin /arcgisserviceplugin/ngageoint*.tgz /arcgisserviceplugin/
73+
# COPY --from=build-sftpserviceplugin /sftpserviceplugin/ngageoint*.tgz /sftpserviceplugin/
74+
# COPY --from=build-sftpwebplugin /sftpwebplugin/ngageoint*.tgz /sftpwebplugin/
7875

79-
WORKDIR /instance
80-
RUN ls -la ../sftpwebplugin
81-
RUN npm install ../service/ngageoint-mage.service*.tgz
82-
RUN npm install ../web-app/ngageoint-mage.web-app*.tgz
83-
RUN npm install ../sftpwebplugin/ngageoint-mage.sftp.web*.tgz
84-
RUN npm install ../sftpserviceplugin/ngageoint-mage.sftp.service*.tgz
85-
RUN npm install ../arcgiswebplugin/ngageoint*.tgz
86-
RUN npm install ../arcgisserviceplugin/ngageoint*.tgz
87-
RUN npm install ../imageserviceplugin/ngageoint*.tgz
76+
ENV MAGE_HOME=/home/mage/instance
77+
WORKDIR ${MAGE_HOME}
8878

79+
RUN npm install ../../../service/ngageoint-mage.service*.tgz
80+
RUN npm install ../../../web-app/ngageoint-mage.web-app*.tgz
81+
# RUN npm install ../../../sftpwebplugin/ngageoint-mage.sftp.web*.tgz
82+
# RUN npm install ../../../sftpserviceplugin/ngageoint-mage.sftp.service*.tgz
83+
# RUN npm install ../../../arcgiswebplugin/ngageoint*.tgz
84+
# RUN npm install ../../../arcgisserviceplugin/ngageoint*.tgz
85+
RUN ln -s ./node_modules/.bin/mage.service
8986

9087
ENV NODE_PATH=./node_modules
91-
ENTRYPOINT [ \
92-
"./node_modules/.bin/mage.service", \
93-
"--plugin", "@ngageoint/mage.image.service", \
94-
"--plugin", "@ngageoint/mage.arcgis.service", \
95-
"--plugin", "@ngageoint/mage.sftp.service", \
96-
"--web-plugin", "@ngageoint/mage.sftp.web", \
97-
"--web-plugin", "@ngageoint/mage.arcgis.web-app" \
98-
]
88+
ENTRYPOINT [ "./mage.service" ]

0 commit comments

Comments
 (0)