From 09883b11294271dfca08d5ceaf7845570482382e Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Wed, 24 Jul 2024 19:04:25 -0600 Subject: [PATCH] chore: Update Dockerfile templates to include CommonProject dependencies --- .github/workflows/compile.yml | 16 ++++++++++++++++ Accounts/Dockerfile.tpl | 7 +++++++ AdminDashboard/Dockerfile.tpl | 7 +++++++ App/Dockerfile.tpl | 7 +++++++ Copilot/Dockerfile.tpl | 7 +++++++ Dashboard/Dockerfile.tpl | 7 +++++++ Ingestor/Dockerfile.tpl | 7 +++++++ IsolatedVM/Dockerfile.tpl | 7 +++++++ Nginx/Dockerfile.tpl | 7 +++++++ Probe/Dockerfile.tpl | 7 +++++++ StatusPage/Dockerfile.tpl | 7 +++++++ TelemetryIngestor/Dockerfile.tpl | 7 +++++++ TestServer/Dockerfile.tpl | 7 +++++++ 13 files changed, 100 insertions(+) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 61c8f98b6e..af586e1247 100644 --- 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 \ No newline at end of file diff --git a/Accounts/Dockerfile.tpl b/Accounts/Dockerfile.tpl index aa0ccb9b84..fbc2f89e27 100644 --- 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 diff --git a/AdminDashboard/Dockerfile.tpl b/AdminDashboard/Dockerfile.tpl index 2931b80f70..04adcef17c 100644 --- 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 diff --git a/App/Dockerfile.tpl b/App/Dockerfile.tpl index 7b1a3fbdbc..39dfe621e6 100644 --- 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 diff --git a/Copilot/Dockerfile.tpl b/Copilot/Dockerfile.tpl index acf6340e02..54303cd475 100644 --- 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/ diff --git a/Dashboard/Dockerfile.tpl b/Dashboard/Dockerfile.tpl index 2413be118e..96d9a99b87 100644 --- 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 diff --git a/Ingestor/Dockerfile.tpl b/Ingestor/Dockerfile.tpl index 7107eb668e..1ee7578eb9 100644 --- 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 diff --git a/IsolatedVM/Dockerfile.tpl b/IsolatedVM/Dockerfile.tpl index 73796f50e3..0c0a3dd87b 100644 --- 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 diff --git a/Nginx/Dockerfile.tpl b/Nginx/Dockerfile.tpl index a5fe82b057..7189f24d73 100644 --- 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/ diff --git a/Probe/Dockerfile.tpl b/Probe/Dockerfile.tpl index b663779b85..0b0b8a511e 100644 --- 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 diff --git a/StatusPage/Dockerfile.tpl b/StatusPage/Dockerfile.tpl index 2db67b1ae2..c6f7c7b861 100644 --- 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 diff --git a/TelemetryIngestor/Dockerfile.tpl b/TelemetryIngestor/Dockerfile.tpl index 19ad6d618d..624e426c64 100644 --- 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 diff --git a/TestServer/Dockerfile.tpl b/TestServer/Dockerfile.tpl index aec9646bf4..049341a7ed 100644 --- 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