Merge branch 'dev-rook-shiva-4777' into test-rook-4777-shiva

bcgov · Feb 8, 2024 · 8ca4439 · 8ca4439
2 parents a1b2dbb + c54c654
commit 8ca4439
Show file tree

Hide file tree

Showing 6 changed files with 18,968 additions and 15,276 deletions.
diff --git a/forms-flow-web/Dockerfile b/forms-flow-web/Dockerfile
@@ -1,6 +1,6 @@
 # base image
 # FROM node:14.17.0-alpine as build-stage
-FROM artifacts.developer.gov.bc.ca/docker-remote/node:14.17.0-alpine as build-stage
+FROM artifacts.developer.gov.bc.ca/docker-remote/node:20.10.0-alpine as build-stage
 
 # set working directory
 WORKDIR /forms-flow-web/app
@@ -84,7 +84,7 @@ RUN npm install --unsafe-perm
 COPY . /forms-flow-web/app/
 RUN npm run build
 
-FROM artifacts.developer.gov.bc.ca/docker-remote/nginx:1.17 as production-stage
+FROM artifacts.developer.gov.bc.ca/docker-remote/nginx:1.25.3 as production-stage
 RUN mkdir /app
 COPY --from=build-stage /forms-flow-web/app/build /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/nginx.conf

diff --git a/forms-flow-web/Dockerfile.local b/forms-flow-web/Dockerfile.local
@@ -1,6 +1,6 @@
 # base image
 # FROM node:14.17.0-alpine as build-stage
-FROM node:14.17.0-alpine as build-stage
+FROM node:20.10.0-alpine as build-stage
 
 # set working directory
 WORKDIR /forms-flow-web/app
@@ -72,12 +72,12 @@ COPY package-lock.json /forms-flow-web/app/package-lock.json
 COPY package.json /forms-flow-web/app/package.json
 
 
-RUN npm install --unsafe-perm
+RUN npm install
 #RUN npm install [email protected] -g --silent
 COPY . /forms-flow-web/app/
 RUN npm run build
 
-FROM nginx:1.17 as production-stage
+FROM nginx:1.25.3 as production-stage
 RUN mkdir /app
 COPY --from=build-stage /forms-flow-web/app/build /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/nginx.conf