From 382c71be93fc56efc9ce9b64abe89cff9a555e55 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Tue, 9 Apr 2024 13:03:32 +0100 Subject: [PATCH] Update Dockerfile.tpl files to set APP_VERSION to 1.0.0 if not set --- Accounts/Dockerfile.tpl | 1 + AdminDashboard/Dockerfile.tpl | 1 + App/Dockerfile.tpl | 1 + Dashboard/Dockerfile.tpl | 1 + InfrastructureAgent/Dockerfile.tpl | 1 + Ingestor/Dockerfile.tpl | 1 + IsolatedVM/Dockerfile.tpl | 1 + Nginx/Dockerfile.tpl | 1 + Probe/Dockerfile.tpl | 1 + StatusPage/Dockerfile.tpl | 1 + TestServer/Dockerfile.tpl | 1 + 11 files changed, 11 insertions(+) diff --git a/Accounts/Dockerfile.tpl b/Accounts/Dockerfile.tpl index ccdd730972..abcdfa421b 100644 --- a/Accounts/Dockerfile.tpl +++ b/Accounts/Dockerfile.tpl @@ -46,6 +46,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/AdminDashboard/Dockerfile.tpl b/AdminDashboard/Dockerfile.tpl index e3bf347ce5..f6be58e1fc 100644 --- a/AdminDashboard/Dockerfile.tpl +++ b/AdminDashboard/Dockerfile.tpl @@ -45,6 +45,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/App/Dockerfile.tpl b/App/Dockerfile.tpl index 7f94e5b0bf..7b1a3fbdbc 100644 --- a/App/Dockerfile.tpl +++ b/App/Dockerfile.tpl @@ -49,6 +49,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/Dashboard/Dockerfile.tpl b/Dashboard/Dockerfile.tpl index a7adf3eadf..69f842f843 100644 --- a/Dashboard/Dockerfile.tpl +++ b/Dashboard/Dockerfile.tpl @@ -45,6 +45,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/InfrastructureAgent/Dockerfile.tpl b/InfrastructureAgent/Dockerfile.tpl index 96be308b66..a9c4e0a919 100644 --- a/InfrastructureAgent/Dockerfile.tpl +++ b/InfrastructureAgent/Dockerfile.tpl @@ -48,6 +48,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/Ingestor/Dockerfile.tpl b/Ingestor/Dockerfile.tpl index 2c3ab8f93e..7df6ee7524 100644 --- a/Ingestor/Dockerfile.tpl +++ b/Ingestor/Dockerfile.tpl @@ -49,6 +49,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/IsolatedVM/Dockerfile.tpl b/IsolatedVM/Dockerfile.tpl index 7070030283..73796f50e3 100644 --- a/IsolatedVM/Dockerfile.tpl +++ b/IsolatedVM/Dockerfile.tpl @@ -49,6 +49,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/Nginx/Dockerfile.tpl b/Nginx/Dockerfile.tpl index 0ccb53628d..57afb98f66 100644 --- a/Nginx/Dockerfile.tpl +++ b/Nginx/Dockerfile.tpl @@ -47,6 +47,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/Probe/Dockerfile.tpl b/Probe/Dockerfile.tpl index 261837aedf..6280ec4358 100644 --- a/Probe/Dockerfile.tpl +++ b/Probe/Dockerfile.tpl @@ -51,6 +51,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/StatusPage/Dockerfile.tpl b/StatusPage/Dockerfile.tpl index 80fd6a7d3a..7139669fdc 100644 --- a/StatusPage/Dockerfile.tpl +++ b/StatusPage/Dockerfile.tpl @@ -46,6 +46,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install diff --git a/TestServer/Dockerfile.tpl b/TestServer/Dockerfile.tpl index 5cd6a56022..9ea9db76c9 100644 --- a/TestServer/Dockerfile.tpl +++ b/TestServer/Dockerfile.tpl @@ -49,6 +49,7 @@ COPY ./Model /usr/src/Model WORKDIR /usr/src/CommonServer +COPY ./CommonServer/package*.json /usr/src/CommonServer/ # Set version in ./CommonServer/package.json to the APP_VERSION RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/CommonServer/package.json RUN npm install