Skip to content

Commit 057e626

Browse files
authored
Merge pull request #243 from ngageoint/local-dockerfile
update dockerignore
2 parents 39887be + 53b361a commit 057e626

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.dockerignore

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

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ RUN npm install
77
COPY service/ ./
88
RUN npm run build
99

10-
# RUN rm -rf node_modules
1110
RUN npm pack
1211

1312
# Build web-app
@@ -19,7 +18,6 @@ RUN npm install
1918
COPY web-app/ ./
2019
RUN npm run build
2120

22-
# RUN rm -rf node_modules
2321
RUN npm pack ./dist
2422

2523
FROM node:20.11.1 AS build-arcwebplugin
@@ -46,7 +44,7 @@ WORKDIR /imageserviceplugin
4644
COPY plugins/image/service/package*.json ./
4745
RUN npm install
4846
COPY --from=build-service /service /imageserviceplugin/node_modules/@ngageoint/mage.service
49-
COPY plugins/arcgis/service/ ./
47+
COPY plugins/image/service/ ./
5048
RUN npm run build
5149
RUN npm pack
5250

@@ -56,12 +54,14 @@ COPY --from=build-service /service/ngageoint*.tgz /service/
5654
COPY --from=build-webapp /web-app/ngageoint*.tgz /web-app/
5755
COPY --from=build-arcwebplugin /arcgiswebplugin/ngageoint*.tgz /arcgiswebplugin/
5856
COPY --from=build-arcserviceplugin /arcgisserviceplugin/ngageoint*.tgz /arcgisserviceplugin/
57+
COPY --from=build-imageserviceplugin /imageserviceplugin/ngageoint*.tgz /imageserviceplugin/
5958

6059
WORKDIR /instance
6160
RUN npm install ../service/ngageoint-mage.service*.tgz \
6261
npm install ../web-app/ngageoint-mage.web-app*.tgz \
6362
npm install ../arcgiswebplugin/ngageoint*.tgz \
64-
npm install ../arcgisserviceplugin/ngageoint*.tgz
63+
npm install ../arcgisserviceplugin/ngageoint*.tgz \
64+
npm install ../imageserviceplugin/ngageoint*.tgz
6565

6666

6767
ENV NODE_PATH=./node_modules

0 commit comments

Comments
 (0)