update docker files (#266)

Co-authored-by: Clinton Werth <[email protected]>

Author: cwerthomni

Dockerfile

@@ -38,15 +38,15 @@ COPY plugins/arcgis/service/ ./
 RUN npm run build
 RUN npm pack
 
-# FROM node:20.11.1 AS build-imageserviceplugin
-# WORKDIR /imageserviceplugin
-# COPY plugins/image/service/package*.json ./
-# RUN npm install
-# COPY --from=build-service /service /imageserviceplugin/node_modules/@ngageoint/mage.service
-# RUN rm -rf /imageserviceplugin/node_modules/@ngageoint/mage.service/node_modules/mongoose
-# COPY plugins/image/service/ ./
-# RUN npm run build
-# RUN npm pack
+FROM node:20.11.1 AS build-imageserviceplugin
+WORKDIR /imageserviceplugin
+COPY plugins/image/service/package*.json ./
+RUN npm install
+COPY --from=build-service /service /imageserviceplugin/node_modules/@ngageoint/mage.service
+RUN rm -rf /imageserviceplugin/node_modules/@ngageoint/mage.service/node_modules/mongoose
+COPY plugins/image/service/ ./
+RUN npm run build
+RUN npm pack
 
 FROM node:20.11.1 AS build-sftpserviceplugin
 WORKDIR /sftpserviceplugin
@@ -74,7 +74,7 @@ COPY --from=build-arcwebplugin /arcgiswebplugin/ngageoint*.tgz /arcgiswebplugin/
 COPY --from=build-arcserviceplugin /arcgisserviceplugin/ngageoint*.tgz /arcgisserviceplugin/
 COPY --from=build-sftpserviceplugin /sftpserviceplugin/ngageoint*.tgz /sftpserviceplugin/
 COPY --from=build-sftpwebplugin /sftpwebplugin/ngageoint*.tgz /sftpwebplugin/
-# COPY --from=build-imageserviceplugin /imageserviceplugin/ngageoint*.tgz /imageserviceplugin/
+COPY --from=build-imageserviceplugin /imageserviceplugin/ngageoint*.tgz /imageserviceplugin/
 
 WORKDIR /instance
 RUN ls -la ../sftpwebplugin
@@ -84,6 +84,7 @@ RUN npm install ../sftpwebplugin/ngageoint-mage.sftp.web*.tgz
 RUN npm install ../sftpserviceplugin/ngageoint-mage.sftp.service*.tgz 
 RUN npm install ../arcgiswebplugin/ngageoint*.tgz 
 RUN npm install ../arcgisserviceplugin/ngageoint*.tgz 
+RUN npm install ../imageserviceplugin/ngageoint*.tgz 
 
 
 ENV NODE_PATH=./node_modules

docker/docker-compose.yml

@@ -15,13 +15,11 @@ services:
 
   mage-server:
     depends_on: [ mage-db ]
-    image: "mage-server:${MAGE_VERSION:-6.2.0}"
+    image: "mage:prod"
     # image: "mage-server:debug"
     build:
       context: ./server
       # dockerfile: Dockerfile-debug
-      args:
-        MAGE_VERSION: "${MAGE_VERSION:-6.2.0}"
     platform: linux/amd64
     volumes:
       - ./server/resources:/var/lib/mage

docker/server/Dockerfile

@@ -21,6 +21,8 @@ RUN ls -l \
     && npm i --omit dev @ngageoint/[email protected] \
     && npm i --omit dev @ngageoint/[email protected] \
     && npm i --omit dev @ngageoint/[email protected] \
+    && npm i --omit dev @ngageoint/[email protected] \
+    && npm i --omit dev @ngageoint/[email protected] \
     && ln -s ./node_modules/.bin/mage.service
 
 VOLUME /var/lib/mage
@@ -29,5 +31,7 @@ EXPOSE 4242
 ENTRYPOINT [ "./mage.service", \
             "--plugin", "@ngageoint/mage.arcgis.service", \
             "--plugin", "@ngageoint/mage.sftp.service", \
+            "--plugin", "@ngageoint/mage.nga-msi", \
+            "--plugin", "@ngageoint/mage.image.service", \
             "--web-plugin", "@ngageoint/mage.arcgis.web-app", \
-            "--web-plugin", "@ngageoint/mage.arcgis.web-app"]
+            "--web-plugin", "@ngageoint/mage.sftp.web"]