Merge pull request #971 from bcgov/dev

Cypress upd dockerfile
bcgov · Dec 6, 2023 · a070d5f · a070d5f
2 parents 29fbea3 + 4c71d0c
commit a070d5f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM node:lts-alpine3.17
+#FROM node:lts-alpine3.17
+FROM node:16.14.2-alpine3.15
 
 ARG APP_VERSION
 ENV NEXT_PUBLIC_APP_VERSION=${APP_VERSION}
@@ -19,7 +20,7 @@ COPY --chown=node src ./
 ARG GITHUB_API_TOKEN
 ENV COOKIE_SECRET=change_me
 
-RUN NODE_OPTIONS=--openssl-legacy-provider npm run build
+RUN npm run build
 
 ENV HOME=/home/node
 

diff --git a/e2e/Dockerfile b/e2e/Dockerfile
@@ -1,4 +1,4 @@
-FROM cypress/included:12.4.0
+FROM cypress/included:12.17.4
 
 WORKDIR /e2e
 

diff --git a/feeds/Dockerfile b/feeds/Dockerfile
@@ -1,5 +1,7 @@
 FROM node:lts-alpine3.17
 
+RUN apk add curl jq
+
 ARG APP_VERSION
 ENV APP_VERSION=${APP_VERSION}
 

diff --git a/local/portal/Dockerfile.E2E b/local/portal/Dockerfile.E2E
@@ -1,4 +1,5 @@
-FROM node:lts-alpine3.17
+#FROM node:lts-alpine3.18
+FROM node:16.14.2-alpine3.15
 
 ARG APP_VERSION
 ENV APP_VERSION=${APP_VERSION}
@@ -24,7 +25,7 @@ RUN npx nyc instrument --compact=false nextapp --in-place
 ARG GITHUB_API_TOKEN
 ENV COOKIE_SECRET=change_me
 
-RUN NODE_OPTIONS=--openssl-legacy-provider npm run build
+RUN npm run build
 
 ENV HOME=/home/node