chore: Update Dockerfile templates to include CommonProject dependencies

2026-04-06 00:32:12 +02:00 · 2024-07-24 19:04:25 -06:00
parent b94b775e46
commit 09883b1129
13 changed files with 100 additions and 0 deletions
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -20,6 +20,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd CommonUI && npm install --force
@@ -35,6 +36,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd CommonServer && npm install
      - run: cd IsolatedVM && npm install && npm run compile && npm run dep-check

@@ -48,6 +50,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install && npm run compile && npm run dep-check

@@ -61,6 +64,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonUI && npm install --force && npm run compile && npm run dep-check

@@ -74,6 +78,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install && npm run compile && npm run dep-check

  compile-app:
@@ -86,6 +91,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd CommonUI && npm install --force
@@ -101,6 +107,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd Copilot && npm install && npm run compile && npm run dep-check
@@ -115,6 +122,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd CommonUI && npm install --force
@@ -141,6 +149,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd CommonUI && npm install --force
@@ -156,6 +165,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd CommonUI && npm install --force
@@ -172,6 +182,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd Model && npm install && npm run compile && npm run dep-check

@@ -185,6 +196,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd E2E && npm install && npm run compile && npm run dep-check

  compile-probe:
@@ -197,6 +209,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd Probe && npm install && npm run compile && npm run dep-check
@@ -211,6 +224,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd Ingestor && npm install && npm run compile && npm run dep-check
@@ -226,6 +240,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd CommonUI && npm install --force
@@ -241,6 +256,7 @@ jobs:
        with:
          node-version: 18.3.0
      - run: cd Common && npm install
+      - run: cd CommonProject && npm install
      - run: cd Model && npm install
      - run: cd CommonServer && npm install
      - run: cd TestServer && npm install && npm run compile && npm run dep-check
--- a/Accounts/Dockerfile.tpl
+++ b/Accounts/Dockerfile.tpl
@@ -43,6 +43,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/AdminDashboard/Dockerfile.tpl
+++ b/AdminDashboard/Dockerfile.tpl
@@ -42,6 +42,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/App/Dockerfile.tpl
+++ b/App/Dockerfile.tpl
@@ -46,6 +46,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/Copilot/Dockerfile.tpl
+++ b/Copilot/Dockerfile.tpl
@@ -44,6 +44,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+

 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
--- a/Dashboard/Dockerfile.tpl
+++ b/Dashboard/Dockerfile.tpl
@@ -42,6 +42,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/Ingestor/Dockerfile.tpl
+++ b/Ingestor/Dockerfile.tpl
@@ -46,6 +46,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/IsolatedVM/Dockerfile.tpl
+++ b/IsolatedVM/Dockerfile.tpl
@@ -46,6 +46,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/Nginx/Dockerfile.tpl
+++ b/Nginx/Dockerfile.tpl
@@ -45,6 +45,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+

 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
--- a/Probe/Dockerfile.tpl
+++ b/Probe/Dockerfile.tpl
@@ -56,6 +56,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/StatusPage/Dockerfile.tpl
+++ b/StatusPage/Dockerfile.tpl
@@ -43,6 +43,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/TelemetryIngestor/Dockerfile.tpl
+++ b/TelemetryIngestor/Dockerfile.tpl
@@ -46,6 +46,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer
--- a/TestServer/Dockerfile.tpl
+++ b/TestServer/Dockerfile.tpl
@@ -46,6 +46,13 @@ RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Mode
 RUN npm install
 COPY ./Model /usr/src/Model

+WORKDIR /usr/src/CommonProject
+COPY ./CommonProject/package*.json /usr/src/CommonProject/
+# Set version in ./CommonProject/package.json to the APP_VERSION
+RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonProject/package.json
+RUN npm install
+COPY ./CommonProject /usr/src/CommonProject
+


 WORKDIR /usr/src/CommonServer