Skip to content

Commit bf7aa12

Browse files
ryanslattenryanslatten
committed
Merge branch 'develop' of https://github.com/ngageoint/mage-server into no-geometry-observations
2 parents 8e85ec8 + e1bb4e1 commit bf7aa12

Some content is hidden

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

56 files changed

+10216
-5525
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/prod.container_build.yaml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Production Container Build
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
tag:
7+
description: The image tag
8+
type: string
9+
required: true
10+
server_version:
11+
description: the version of the web server_version
12+
type: string
13+
required: true
14+
arc_version:
15+
description: the version of the arc plugin
16+
type: string
17+
required: true
18+
default: NONE
19+
sftp_version:
20+
description: the version of the sftp plugin
21+
required: true
22+
default: NONE
23+
24+
permissions:
25+
contents: read
26+
packages: write
27+
28+
jobs:
29+
build-and-push:
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: Checkout Repo
33+
uses: actions/checkout@v4
34+
35+
- name: Login to Github Registry ghcr.io
36+
uses: docker/login-action@v3
37+
with:
38+
registry: ghcr.io
39+
username: ${{ github.actor }}
40+
password: ${{ secrets.GITHUB_TOKEN }}
41+
42+
- name: Build Docker image
43+
run: |
44+
docker build \
45+
--build-arg SERVER_VERSION=${{ inputs.server_version }} \
46+
--build-arg ARC_VERSION=${{ inputs.arc_version }} \
47+
--build-arg SFTP_VERSION=${{ inputs.sftp_version }} \
48+
-t ghcr.io/${{ github.repository }}/mage:${{ inputs.tag }} ./docker/server
49+
50+
- name: Push Image
51+
run: |
52+
docker push ghcr.io/${{ github.repository }}/mage:$IMAGE_TAG

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ jobs:
128128
- name: publish mage service
129129
run: |
130130
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..."
131+
npm publish --access public $(ls -1 ngageoint-mage.service-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage service publish..."
132132
- name: publish mage web
133133
run: |
134134
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..."
135+
npm publish --access public $(ls -1 ngageoint-mage.web-app-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage web app publish..."
136136
- name: publish mage core
137137
run: |
138138
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..."
139+
npm publish --access public $(ls -1 ngageoint-mage.web-core-lib-*.tgz) ${{(inputs.is_prerelease && '--tag beta') || ''}} || echo "skipping mage core publish..."

‎CODEOWNERS‎

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

‎Dockerfile‎

Lines changed: 47 additions & 55 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,27 +15,26 @@ 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

4139
# FROM node:20.11.1 AS build-imageserviceplugin
4240
# WORKDIR /imageserviceplugin
@@ -48,49 +46,43 @@ RUN npm pack
4846
# RUN npm run build
4947
# 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/
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/
7775

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

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
8786

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

‎docker/server/Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
FROM registry1.dso.mil/ironbank/opensource/nodejs/debian/nodejs:20.11.1
2+
ARG SERVER_VERSION=6.4.0-beta.1
3+
ARG ARC_VERSION=NONE
4+
ARG SFTP_VERSION=NONE
25

36
LABEL author="NGA"
47

@@ -15,12 +18,10 @@ USER mage
1518
ENV MAGE_HOME=/home/mage/instance
1619
WORKDIR ${MAGE_HOME}
1720
RUN ls -l \
18-
&& npm i --omit dev @ngageoint/[email protected] \
19-
&& npm i --omit dev @ngageoint/[email protected] \
20-
&& npm i --omit dev @ngageoint/[email protected] \
21-
&& npm i --omit dev @ngageoint/[email protected] \
22-
&& npm i --omit dev @ngageoint/[email protected] \
23-
&& npm i --omit dev @ngageoint/[email protected] \
21+
&& npm i --omit dev @ngageoint/mage.service@${SERVER_VERSION} \
22+
&& npm i --omit dev @ngageoint/mage.web-app@${SERVER_VERSION} \
23+
&& if [ "$ARC_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.arcgis.service@$ARC_VERSION @ngageoint/mage.arcgis.web-app@$ARC_VERSION; fi\
24+
&& if [ "$SFTP_VERSION" != "NONE" ]; then npm i --omit dev @ngageoint/mage.sftp.service@$SFTP_VERSION @ngageoint/mage.sftp.web@$SFTP_VERSION; fi \
2425
&& ln -s ./node_modules/.bin/mage.service
2526

2627
VOLUME /var/lib/mage

‎instance/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.dev-instance",
3-
"version": "6.3.0",
3+
"version": "6.4.0-beta.1",
44
"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.",
55
"scripts": {
66
"start": "npm run start:dev",

0 commit comments

Comments
 (0)