Skip to content

Commit ff06765

Browse files
authored
Merge pull request #249 from ngageoint/sftp-container
Sftp container
2 parents 2fbb10f + 500e5b6 commit ff06765

Some content is hidden

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

70 files changed

+42244
-17
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ scratch/
2020
/docker/auth-idp/ldap/db/*
2121
# this line must be last
2222
!.gitkeep
23+
.angular

Dockerfile

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ FROM node:20.11.1 AS build-arcwebplugin
2525
WORKDIR /arcgiswebplugin
2626
COPY plugins/arcgis/web-app/package*.json ./
2727
RUN npm install
28-
COPY --from=build-service /service /arcgisserviceplugin/node_modules/@ngageoint/mage.service
28+
COPY --from=build-service /service /arcgiswebplugin/node_modules/@ngageoint/mage.service
2929
COPY plugins/arcgis/web-app/ ./
3030
RUN npm run build
3131
RUN npm pack ./dist/main
@@ -39,36 +39,63 @@ COPY plugins/arcgis/service/ ./
3939
RUN npm run build
4040
RUN npm pack
4141

42-
FROM node:20.11.1 AS build-imageserviceplugin
43-
WORKDIR /imageserviceplugin
44-
COPY plugins/image/service/package*.json ./
42+
# FROM node:20.11.1 AS build-imageserviceplugin
43+
# WORKDIR /imageserviceplugin
44+
# COPY plugins/image/service/package*.json ./
45+
# RUN npm install
46+
# COPY --from=build-service /service /imageserviceplugin/node_modules/@ngageoint/mage.service
47+
# RUN rm -rf /imageserviceplugin/node_modules/@ngageoint/mage.service/node_modules/mongoose
48+
# COPY plugins/image/service/ ./
49+
# RUN npm run build
50+
# RUN npm pack
51+
52+
FROM node:20.11.1 AS build-sftpserviceplugin
53+
WORKDIR /sftpserviceplugin
54+
COPY plugins/sftp/service/package*.json ./
55+
RUN ls -la /sftpserviceplugin
56+
RUN cat package.json
57+
RUN npm cache clean --force
4558
RUN npm install
46-
COPY --from=build-service /service /imageserviceplugin/node_modules/@ngageoint/mage.service
47-
RUN rm -rf /imageserviceplugin/node_modules/@ngageoint/mage.service/node_modules/mongoose
48-
COPY plugins/image/service/ ./
59+
COPY --from=build-service /service /sftpserviceplugin/node_modules/@ngageoint/mage.service
60+
COPY plugins/sftp/service/ ./
4961
RUN npm run build
5062
RUN npm pack
5163

64+
FROM node:20.11.1 AS build-sftpwebplugin
65+
# Build sftp service plugin
66+
WORKDIR /sftpwebplugin
67+
COPY plugins/sftp/web/package*.json ./
68+
RUN npm install
69+
COPY plugins/sftp/web/ ./
70+
RUN npm run build
71+
RUN npm pack ./dist/admin
72+
5273
# Build instance
5374
FROM node:20.11.1 AS build-instance
5475
COPY --from=build-service /service/ngageoint*.tgz /service/
5576
COPY --from=build-webapp /web-app/ngageoint*.tgz /web-app/
5677
COPY --from=build-arcwebplugin /arcgiswebplugin/ngageoint*.tgz /arcgiswebplugin/
5778
COPY --from=build-arcserviceplugin /arcgisserviceplugin/ngageoint*.tgz /arcgisserviceplugin/
58-
COPY --from=build-imageserviceplugin /imageserviceplugin/ngageoint*.tgz /imageserviceplugin/
79+
COPY --from=build-sftpwebplugin /sftpwebplugin/ngageoint*.tgz /sftpwebplugin/
80+
COPY --from=build-sftpserviceplugin /sftpserviceplugin/ngageoint*.tgz /sftpserviceplugin/
81+
# COPY --from=build-imageserviceplugin /imageserviceplugin/ngageoint*.tgz /imageserviceplugin/
5982

6083
WORKDIR /instance
61-
RUN npm install ../service/ngageoint-mage.service*.tgz \
62-
npm install ../web-app/ngageoint-mage.web-app*.tgz \
63-
npm install ../arcgiswebplugin/ngageoint*.tgz \
64-
npm install ../arcgisserviceplugin/ngageoint*.tgz \
65-
npm install ../imageserviceplugin/ngageoint*.tgz
84+
RUN ls -la ../sftpwebplugin
85+
RUN npm install ../sftpwebplugin/ngageoint*.tgz
86+
RUN npm install ../sftpserviceplugin/ngageoint*.tgz
87+
RUN npm install ../service/ngageoint-mage.service*.tgz
88+
RUN npm install ../web-app/ngageoint-mage.web-app*.tgz
89+
RUN npm install ../arcgiswebplugin/ngageoint*.tgz
90+
RUN npm install ../arcgisserviceplugin/ngageoint*.tgz
6691

6792

6893
ENV NODE_PATH=./node_modules
6994
ENTRYPOINT [ \
7095
"./node_modules/.bin/mage.service", \
7196
"--plugin", "@ngageoint/mage.image.service", \
7297
"--plugin", "@ngageoint/mage.arcgis.service", \
98+
"--plugin", "@ngageoint/mage.sftp.service", \
99+
"--web-plugin", "@ngageoint/mage.sftp.web", \
73100
"--web-plugin", "@ngageoint/mage.arcgis.web-app" \
74101
]

instance/config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ module.exports = {
3434
plugins: {
3535
servicePlugins: [
3636
'@ngageoint/mage.arcgis.service',
37-
'@ngageoint/mage.image.service',
38-
'@ngageoint/mage.nga-msi',
39-
'@ngageoint/mage.random',
37+
38+
'@ngageoint/mage.sftp.service'
4039
],
4140
webUIPlugins: [
42-
'@ngageoint/mage.arcgis.web-app'
41+
'@ngageoint/mage.arcgis.web-app',
42+
'@ngageoint/mage.sftp.web'
4343
],
4444
},
4545
}

instance/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"@ngageoint/mage.image.service": "../plugins/image/service",
3232
"@ngageoint/mage.nga-msi": "../plugins/nga-msi",
3333
"@ngageoint/mage.random": "../plugins/random",
34+
"@ngageoint/mage.sftp.web": "../plugins/sftp/web/dist/admin",
35+
"@ngageoint/mage.sftp.service": "../plugins/sftp/service",
3436
"@ngageoint/mage.service": "../service",
3537
"@ngageoint/mage.web-app": "../web-app/dist"
3638
}

plugins/sftp/README.md

Whitespace-only changes.

plugins/sftp/service/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/lib/
2+
*scratch*/

0 commit comments

Comments
 (0)