Skip to content

Commit 8a98e00

Browse files
cwerthomniClinton Werth
andauthored
Fix sftp docker build (#255)
* fix express dependency and docker build * remove extra lines from dockerfile * update package lock --------- Co-authored-by: Clinton Werth <[email protected]>
1 parent cbf6bda commit 8a98e00

File tree

3 files changed

+148
-120
lines changed

3 files changed

+148
-120
lines changed

Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ RUN npm pack
5151
FROM node:20.11.1 AS build-sftpserviceplugin
5252
WORKDIR /sftpserviceplugin
5353
COPY plugins/sftp/service/package*.json ./
54-
RUN ls -la /sftpserviceplugin
55-
RUN cat package.json
56-
RUN npm cache clean --force
5754
RUN npm install
5855
COPY --from=build-service /service /sftpserviceplugin/node_modules/@ngageoint/mage.service
5956
COPY plugins/sftp/service/ ./
@@ -67,24 +64,24 @@ COPY plugins/sftp/web/package*.json ./
6764
RUN npm install
6865
COPY plugins/sftp/web/ ./
6966
RUN npm run build
70-
RUN npm pack ./dist/admin
67+
RUN npm pack ./dist/main
7168

7269
# Build instance
7370
FROM node:20.11.1 AS build-instance
7471
COPY --from=build-service /service/ngageoint*.tgz /service/
7572
COPY --from=build-webapp /web-app/ngageoint*.tgz /web-app/
7673
COPY --from=build-arcwebplugin /arcgiswebplugin/ngageoint*.tgz /arcgiswebplugin/
7774
COPY --from=build-arcserviceplugin /arcgisserviceplugin/ngageoint*.tgz /arcgisserviceplugin/
78-
COPY --from=build-sftpwebplugin /sftpwebplugin/ngageoint*.tgz /sftpwebplugin/
7975
COPY --from=build-sftpserviceplugin /sftpserviceplugin/ngageoint*.tgz /sftpserviceplugin/
76+
COPY --from=build-sftpwebplugin /sftpwebplugin/ngageoint*.tgz /sftpwebplugin/
8077
# COPY --from=build-imageserviceplugin /imageserviceplugin/ngageoint*.tgz /imageserviceplugin/
8178

8279
WORKDIR /instance
8380
RUN ls -la ../sftpwebplugin
84-
RUN npm install ../sftpwebplugin/ngageoint*.tgz
85-
RUN npm install ../sftpserviceplugin/ngageoint*.tgz
8681
RUN npm install ../service/ngageoint-mage.service*.tgz
87-
RUN npm install ../web-app/ngageoint-mage.web-app*.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
8885
RUN npm install ../arcgiswebplugin/ngageoint*.tgz
8986
RUN npm install ../arcgisserviceplugin/ngageoint*.tgz
9087

0 commit comments

Comments
 (0)