From 315ea47621367e5bc40da6c5e498f3d325787050 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 11:01:40 -0600 Subject: [PATCH 01/34] Update Dockerfile --- app/caseflow_web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index c969fe619..b024c0a3c 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -22,7 +22,7 @@ RUN npm install react-scripts@3.4.1 -g --silent RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache # add app files -COPY . ./case-flow-web +COPY . /case-flow-web/app/ RUN npm run build From 36940515fff01fbddd0411ef9adcc00a0d6f3ab5 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 12:13:15 -0600 Subject: [PATCH 02/34] Update Dockerfile --- app/caseflow_web/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index b024c0a3c..46c3a35f8 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -31,4 +31,8 @@ RUN mkdir /app COPY --from=build-stage /case-flow-web/app/build /usr/share/nginx/html COPY ./nginx.conf /etc/nginx/nginx.conf +# Set proper permissions and ownership for nginx directories +RUN mkdir -p /var/cache/nginx/client_temp \ + && chown -R nginx:nginx /var/cache/nginx + CMD ["nginx", "-g", "daemon off;"] From d181a644c255208396b01717a5ba47f428227eb2 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 13:07:34 -0600 Subject: [PATCH 03/34] Update Dockerfile --- app/caseflow_web/Dockerfile | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 46c3a35f8..f1de7edd8 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -26,13 +26,31 @@ COPY . /case-flow-web/app/ RUN npm run build +# Use nginx as the base image FROM nginx:1.17 as production-stage + +# Create a directory for your application RUN mkdir /app + +# Add 'nginx' user to the 'root' group +ARG user=nginx +RUN usermod -a -G root $user + +# Copy the built files from the build stage to the nginx HTML directory COPY --from=build-stage /case-flow-web/app/build /usr/share/nginx/html + +# Copy your nginx.conf file from the host to the nginx configuration directory in the Docker image COPY ./nginx.conf /etc/nginx/nginx.conf # Set proper permissions and ownership for nginx directories -RUN mkdir -p /var/cache/nginx/client_temp \ - && chown -R nginx:nginx /var/cache/nginx +RUN chown -R $user:root /etc/nginx/ \ + && chmod -R ug+rw /etc/nginx/ \ + && chown -R $user:root /var/cache/nginx \ + && chmod -R ug+rw /var/cache/nginx \ + && chmod g+rw /etc/passwd + +# Switch to the 'nginx' user for running the container +USER $user +# Start nginx with the appropriate command CMD ["nginx", "-g", "daemon off;"] From 28a3e98af966e2ab6666dbe7d4a81804ae3f63cc Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 14:25:10 -0600 Subject: [PATCH 04/34] updated --- app/caseflow_web/Dockerfile | 26 ++------------------------ app/caseflow_web/nginx.conf | 1 - 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index f1de7edd8..db55bd29a 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -22,35 +22,13 @@ RUN npm install react-scripts@3.4.1 -g --silent RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache # add app files -COPY . /case-flow-web/app/ +COPY . ./case-flow-web RUN npm run build -# Use nginx as the base image FROM nginx:1.17 as production-stage - -# Create a directory for your application RUN mkdir /app - -# Add 'nginx' user to the 'root' group -ARG user=nginx -RUN usermod -a -G root $user - -# Copy the built files from the build stage to the nginx HTML directory COPY --from=build-stage /case-flow-web/app/build /usr/share/nginx/html - -# Copy your nginx.conf file from the host to the nginx configuration directory in the Docker image COPY ./nginx.conf /etc/nginx/nginx.conf - -# Set proper permissions and ownership for nginx directories -RUN chown -R $user:root /etc/nginx/ \ - && chmod -R ug+rw /etc/nginx/ \ - && chown -R $user:root /var/cache/nginx \ - && chmod -R ug+rw /var/cache/nginx \ - && chmod g+rw /etc/passwd - -# Switch to the 'nginx' user for running the container -USER $user - # Start nginx with the appropriate command -CMD ["nginx", "-g", "daemon off;"] +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/app/caseflow_web/nginx.conf b/app/caseflow_web/nginx.conf index 64754d05e..62881b1ea 100644 --- a/app/caseflow_web/nginx.conf +++ b/app/caseflow_web/nginx.conf @@ -1,4 +1,3 @@ -user nginx; worker_processes auto; error_log /var/log/nginx/error.log warn; pid /var/run/nginx.pid; From 5ebb3d06cc82ea8558932918ba01536fea5a5830 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 14:48:58 -0600 Subject: [PATCH 05/34] updated --- app/caseflow_web/Dockerfile | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index db55bd29a..3c593ff49 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -1,34 +1,29 @@ # base image FROM node:14.17.0-alpine as build-stage -# set working directory -WORKDIR /case-flow-web/app - # add `/app/node_modules/.bin` to $PATH -ENV PATH /case-flow-web/app/node_modules/.bin:$PATH +ENV PATH /node_modules/.bin:$PATH RUN apk update && apk upgrade && \ apk add --no-cache bash git openssh # install and cache app dependencies +COPY ./package*.json ./ +RUN npm ci +COPY . ./ -COPY package-lock.json /case-flow-web/app/package-lock.json -COPY package.json /case-flow-web/app/package.json +RUN npm run build -RUN npm install --silent -RUN npm install react-scripts@3.4.1 -g --silent +FROM artifacts.developer.gov.bc.ca/redhat-access-docker-remote/ubi8/nginx-122 AS deployer -# create and set user permissions to app folder -RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache +USER default -# add app files -COPY . ./case-flow-web +# Copy the app built on build-stage to the resulting container. +COPY --from=build-stage /opt/app-root/src/dist . -RUN npm run build +# Copy the default.conf to /etc/nginx/conf.d +COPY --from=builder /opt/app-root/src/default.conf /etc/nginx/conf.d -FROM nginx:1.17 as production-stage -RUN mkdir /app -COPY --from=build-stage /case-flow-web/app/build /usr/share/nginx/html COPY ./nginx.conf /etc/nginx/nginx.conf # Start nginx with the appropriate command CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From ae04a9e7339e845ce832105848865c7ba71fe588 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 14:58:34 -0600 Subject: [PATCH 06/34] updated --- .github/workflows/caseflow_web_os.yml | 8 ++--- app/caseflow_web/Dockerfile | 42 ++++++++++++++------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/caseflow_web_os.yml b/.github/workflows/caseflow_web_os.yml index d0c5abe0a..b853dcc27 100644 --- a/.github/workflows/caseflow_web_os.yml +++ b/.github/workflows/caseflow_web_os.yml @@ -43,10 +43,10 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' cache-dependency-path: "./app/caseflow_web/package-lock.json" - - run: npm install --force - working-directory: ./app/caseflow_web - - run: CI=false npm run build - working-directory: ./app/caseflow_web + # - run: npm install --force + # working-directory: ./app/caseflow_web + # - run: CI=false npm run build + # working-directory: ./app/caseflow_web - name: Set ENV variables diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 3c593ff49..5c4405d13 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -1,29 +1,31 @@ -# base image -FROM node:14.17.0-alpine as build-stage +# "build-stage", based on Node.js, to build and compile the frontend +# pull official base image +FROM node:14-alpine as build-stage -# add `/app/node_modules/.bin` to $PATH -ENV PATH /node_modules/.bin:$PATH +# set working directory +WORKDIR /app -RUN apk update && apk upgrade && \ - apk add --no-cache bash git openssh +# add `/app/node_modules/.bin` to $PATH +ENV PATH /app/node_modules/.bin:$PATH -# install and cache app dependencies -COPY ./package*.json ./ -RUN npm ci -COPY . ./ +# install app dependencies +COPY package.json ./ +COPY package-lock.json ./ -RUN npm run build +RUN npm install --silent +RUN npm install react-scripts@3.4.1 -g --silent -FROM artifacts.developer.gov.bc.ca/redhat-access-docker-remote/ubi8/nginx-122 AS deployer +# create and set user permissions to app folder +RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache -USER default - -# Copy the app built on build-stage to the resulting container. -COPY --from=build-stage /opt/app-root/src/dist . +# add app files +COPY . ./ -# Copy the default.conf to /etc/nginx/conf.d -COPY --from=builder /opt/app-root/src/default.conf /etc/nginx/conf.d +RUN npm run build -COPY ./nginx.conf /etc/nginx/nginx.conf -# Start nginx with the appropriate command +# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx +FROM nginx:1.17 as production-stage +RUN mkdir /app +COPY --from=build-stage /app/build /usr/share/nginx/html +COPY nginx.conf /etc/nginx/nginx.conf CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From 3cb66959808fce23da18b965df781c1afede3686 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 16:22:19 -0600 Subject: [PATCH 07/34] Update Dockerfile --- app/caseflow_web/Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 5c4405d13..19a74fd32 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -1,31 +1,31 @@ -# "build-stage", based on Node.js, to build and compile the frontend -# pull official base image +# Build stage FROM node:14-alpine as build-stage -# set working directory WORKDIR /app -# add `/app/node_modules/.bin` to $PATH ENV PATH /app/node_modules/.bin:$PATH -# install app dependencies -COPY package.json ./ -COPY package-lock.json ./ +COPY package.json package-lock.json ./ RUN npm install --silent RUN npm install react-scripts@3.4.1 -g --silent -# create and set user permissions to app folder RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache -# add app files -COPY . ./ +COPY . . RUN npm run build -# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx -FROM nginx:1.17 as production-stage +# Production stage +FROM nginx:1.17-alpine as production-stage + +# Create necessary directories with appropriate permissions +RUN mkdir -p /var/cache/nginx/client_temp && \ + chown -R nginx:nginx /var/cache/nginx + RUN mkdir /app + COPY --from=build-stage /app/build /usr/share/nginx/html COPY nginx.conf /etc/nginx/nginx.conf -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file + +CMD ["nginx", "-g", "daemon off;"] From fcd62db51e7a12497b1322ea597acd5c06c25449 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 16:45:53 -0600 Subject: [PATCH 08/34] Update Dockerfile --- app/caseflow_web/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 19a74fd32..6a63b60e9 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -20,7 +20,11 @@ RUN npm run build FROM nginx:1.17-alpine as production-stage # Create necessary directories with appropriate permissions -RUN mkdir -p /var/cache/nginx/client_temp && \ +RUN mkdir -p /var/cache/nginx/client_temp \ + /var/cache/nginx/proxy_temp \ + /var/cache/nginx/fastcgi_temp \ + /var/cache/nginx/uwsgi_temp \ + /var/cache/nginx/scgi_temp && \ chown -R nginx:nginx /var/cache/nginx RUN mkdir /app From 6b91e03051723cafa361676a00e80c1819e952d9 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 17:12:46 -0600 Subject: [PATCH 09/34] Update nginx.conf --- app/caseflow_web/nginx.conf | 43 ++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/app/caseflow_web/nginx.conf b/app/caseflow_web/nginx.conf index 62881b1ea..f2f429736 100644 --- a/app/caseflow_web/nginx.conf +++ b/app/caseflow_web/nginx.conf @@ -1,28 +1,31 @@ worker_processes auto; error_log /var/log/nginx/error.log warn; pid /var/run/nginx.pid; + events { - worker_connections 1024; + worker_connections 1024; } + http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - #tcp_nopush on; + include /etc/nginx/mime.types; + default_type application/octet-stream; + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + access_log /var/log/nginx/access.log main; + sendfile on; + #tcp_nopush on; - keepalive_timeout 65; - #gzip on; - #include /etc/nginx/conf.d/*.conf; -server { - listen 80; - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ /index.html; - } + keepalive_timeout 65; + #gzip on; + #include /etc/nginx/conf.d/*.conf; + + server { + listen 8080; # Change the port to 8080 + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + } + } } -} \ No newline at end of file From 6a6dbe0f1c42e4a923d7fe42c6454bd91b16142f Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 17:40:50 -0600 Subject: [PATCH 10/34] Update Dockerfile --- app/caseflow_web/Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 6a63b60e9..66f020739 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -24,12 +24,20 @@ RUN mkdir -p /var/cache/nginx/client_temp \ /var/cache/nginx/proxy_temp \ /var/cache/nginx/fastcgi_temp \ /var/cache/nginx/uwsgi_temp \ - /var/cache/nginx/scgi_temp && \ - chown -R nginx:nginx /var/cache/nginx + /var/cache/nginx/scgi_temp \ + /var/run/nginx && \ + chown -R nginx:nginx /var/cache/nginx \ + /var/run/nginx RUN mkdir /app COPY --from=build-stage /app/build /usr/share/nginx/html COPY nginx.conf /etc/nginx/nginx.conf +# Ensure Nginx can write to access and error logs +RUN touch /var/log/nginx/access.log \ + /var/log/nginx/error.log && \ + chown nginx:nginx /var/log/nginx/access.log \ + /var/log/nginx/error.log + CMD ["nginx", "-g", "daemon off;"] From b0d0a72fd6eee708799a89102d9d70628d975002 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 18:05:58 -0600 Subject: [PATCH 11/34] Update Dockerfile --- app/caseflow_web/Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 66f020739..b4042a395 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -27,17 +27,12 @@ RUN mkdir -p /var/cache/nginx/client_temp \ /var/cache/nginx/scgi_temp \ /var/run/nginx && \ chown -R nginx:nginx /var/cache/nginx \ - /var/run/nginx + /var/run/nginx && \ + chmod 777 /var/run/nginx.pid RUN mkdir /app COPY --from=build-stage /app/build /usr/share/nginx/html COPY nginx.conf /etc/nginx/nginx.conf -# Ensure Nginx can write to access and error logs -RUN touch /var/log/nginx/access.log \ - /var/log/nginx/error.log && \ - chown nginx:nginx /var/log/nginx/access.log \ - /var/log/nginx/error.log - CMD ["nginx", "-g", "daemon off;"] From 6b26b1864fbf0acb5ee14bb15082a8ce17d68737 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 18:32:26 -0600 Subject: [PATCH 12/34] updated --- app/caseflow_web/Dockerfile | 20 +++++++------------ app/caseflow_web/nginx.conf | 39 ++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index b4042a395..832233df2 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -19,20 +19,14 @@ RUN npm run build # Production stage FROM nginx:1.17-alpine as production-stage -# Create necessary directories with appropriate permissions -RUN mkdir -p /var/cache/nginx/client_temp \ - /var/cache/nginx/proxy_temp \ - /var/cache/nginx/fastcgi_temp \ - /var/cache/nginx/uwsgi_temp \ - /var/cache/nginx/scgi_temp \ - /var/run/nginx && \ - chown -R nginx:nginx /var/cache/nginx \ - /var/run/nginx && \ - chmod 777 /var/run/nginx.pid - -RUN mkdir /app +# Copy nginx configuration +COPY nginx.conf /etc/nginx/nginx.conf +# Copy build files from the build stage COPY --from=build-stage /app/build /usr/share/nginx/html -COPY nginx.conf /etc/nginx/nginx.conf +# Expose port 8080 +EXPOSE 8080 + +# Start Nginx CMD ["nginx", "-g", "daemon off;"] diff --git a/app/caseflow_web/nginx.conf b/app/caseflow_web/nginx.conf index f2f429736..0cfefd231 100644 --- a/app/caseflow_web/nginx.conf +++ b/app/caseflow_web/nginx.conf @@ -1,31 +1,30 @@ -worker_processes auto; -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; +# Nginx configuration file + +user nginx; + +worker_processes auto; + +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; events { - worker_connections 1024; + worker_connections 1024; } http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + include /etc/nginx/mime.types; + default_type application/octet-stream; + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - #gzip on; - #include /etc/nginx/conf.d/*.conf; + access_log /var/log/nginx/access.log main; + sendfile on; + keepalive_timeout 65; server { - listen 8080; # Change the port to 8080 - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ /index.html; - } + listen 8080; + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; } } From 8848da019f3ff7de4949eb4d30e2f13170276734 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 18:34:03 -0600 Subject: [PATCH 13/34] updated --- app/caseflow_web/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 832233df2..313b5e81d 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -8,7 +8,6 @@ ENV PATH /app/node_modules/.bin:$PATH COPY package.json package-lock.json ./ RUN npm install --silent -RUN npm install react-scripts@3.4.1 -g --silent RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache From 310e0d56f4b888e23a7efeb0a66fedb20227a333 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 18:50:07 -0600 Subject: [PATCH 14/34] updated --- app/caseflow_web/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app/caseflow_web/package.json b/app/caseflow_web/package.json index 0d23742a7..ab7ddb470 100644 --- a/app/caseflow_web/package.json +++ b/app/caseflow_web/package.json @@ -81,6 +81,7 @@ ] }, "devDependencies": { + "@babel/plugin-proposal-private-property-in-object": "^7.16.0", // Added this line "sass": "^1.55.0" } } From 1df5a47425fef85a305d99665973c510d3526ca1 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 18:53:35 -0600 Subject: [PATCH 15/34] updated --- app/caseflow_web/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/nginx.conf b/app/caseflow_web/nginx.conf index 0cfefd231..83d794c9c 100644 --- a/app/caseflow_web/nginx.conf +++ b/app/caseflow_web/nginx.conf @@ -1,6 +1,6 @@ # Nginx configuration file -user nginx; +user root; worker_processes auto; From a52f6080afc9e43dae9771a5decf588f6e2e628d Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 18:55:18 -0600 Subject: [PATCH 16/34] updated --- app/caseflow_web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/package.json b/app/caseflow_web/package.json index ab7ddb470..07159788c 100644 --- a/app/caseflow_web/package.json +++ b/app/caseflow_web/package.json @@ -81,7 +81,7 @@ ] }, "devDependencies": { - "@babel/plugin-proposal-private-property-in-object": "^7.16.0", // Added this line + "@babel/plugin-proposal-private-property-in-object": "^7.16.0", "sass": "^1.55.0" } } From 5bcdd4de0b208abf64b6e455a03fe807fef640d5 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 19:18:50 -0600 Subject: [PATCH 17/34] updated --- app/caseflow_web/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 313b5e81d..e111ab1e2 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -7,6 +7,9 @@ ENV PATH /app/node_modules/.bin:$PATH COPY package.json package-lock.json ./ +# Run npm install and other build steps as root +USER root + RUN npm install --silent RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache @@ -18,6 +21,9 @@ RUN npm run build # Production stage FROM nginx:1.17-alpine as production-stage +# Set the user to root explicitly +USER root + # Copy nginx configuration COPY nginx.conf /etc/nginx/nginx.conf From c444128c688f416b99c41152af802b7e8774093b Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 19:51:50 -0600 Subject: [PATCH 18/34] updated --- app/caseflow_web/Dockerfile | 7 ++----- app/caseflow_web/nginx.conf | 36 +++++++++++++++--------------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index e111ab1e2..2ebcda4e2 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -7,10 +7,7 @@ ENV PATH /app/node_modules/.bin:$PATH COPY package.json package-lock.json ./ -# Run npm install and other build steps as root -USER root - -RUN npm install --silent +RUN npm install RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache @@ -22,7 +19,7 @@ RUN npm run build FROM nginx:1.17-alpine as production-stage # Set the user to root explicitly -USER root +USER nginx; # Copy nginx configuration COPY nginx.conf /etc/nginx/nginx.conf diff --git a/app/caseflow_web/nginx.conf b/app/caseflow_web/nginx.conf index 83d794c9c..3ed620451 100644 --- a/app/caseflow_web/nginx.conf +++ b/app/caseflow_web/nginx.conf @@ -1,30 +1,24 @@ -# Nginx configuration file - -user root; - worker_processes auto; -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; +# Log to stdout +error_log /dev/stdout info; +pid /tmp/nginx.pid; events { - worker_connections 1024; + worker_connections 1024; } http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - keepalive_timeout 65; - - server { - listen 8080; - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ /index.html; + include /etc/nginx/mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + server { + listen 8080; + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; } + } } From ff5cc14b5908d96e4b5d913493ab105a037b0a0e Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 20:14:36 -0600 Subject: [PATCH 19/34] udated --- app/caseflow_web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 2ebcda4e2..5d3e967c8 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -16,7 +16,7 @@ COPY . . RUN npm run build # Production stage -FROM nginx:1.17-alpine as production-stage +FROM registry.access.redhat.com/ubi8/nginx as production-stage # Set the user to root explicitly USER nginx; From fc4fcef35b6a392a3b82fe7772b3bd2b1529cc31 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 20:28:07 -0600 Subject: [PATCH 20/34] updated --- app/caseflow_web/Dockerfile | 5 ----- app/caseflow_web/nginx.conf | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index 5d3e967c8..a228f5baf 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -9,8 +9,6 @@ COPY package.json package-lock.json ./ RUN npm install -RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache - COPY . . RUN npm run build @@ -18,9 +16,6 @@ RUN npm run build # Production stage FROM registry.access.redhat.com/ubi8/nginx as production-stage -# Set the user to root explicitly -USER nginx; - # Copy nginx configuration COPY nginx.conf /etc/nginx/nginx.conf diff --git a/app/caseflow_web/nginx.conf b/app/caseflow_web/nginx.conf index 3ed620451..c4b7bb9f0 100644 --- a/app/caseflow_web/nginx.conf +++ b/app/caseflow_web/nginx.conf @@ -9,6 +9,11 @@ events { } http { + client_body_temp_path /tmp/client_temp; + proxy_temp_path /tmp/proxy_temp_path; + fastcgi_temp_path /tmp/fastcgi_temp; + uwsgi_temp_path /tmp/uwsgi_temp; + scgi_temp_path /tmp/scgi_temp; include /etc/nginx/mime.types; default_type application/octet-stream; sendfile on; @@ -22,3 +27,4 @@ http { } } } + From 454148926ca0d2255d873797b81067b4c9ce072f Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 20:35:23 -0600 Subject: [PATCH 21/34] updated --- app/caseflow_web/Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index a228f5baf..a7c32aa6f 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -1,29 +1,29 @@ -# Build stage -FROM node:14-alpine as build-stage +# Use a smaller base image for the build stage +FROM node:latest AS build-stage +# Set working directory WORKDIR /app -ENV PATH /app/node_modules/.bin:$PATH - +# Copy package.json and package-lock.json separately to leverage Docker caching COPY package.json package-lock.json ./ -RUN npm install +# Install dependencies +RUN npm install --silent +# Add app files COPY . . +# Build the app RUN npm run build -# Production stage -FROM registry.access.redhat.com/ubi8/nginx as production-stage - -# Copy nginx configuration -COPY nginx.conf /etc/nginx/nginx.conf +# Use a smaller base image for the production stage +FROM nginx:1.21 AS production-stage -# Copy build files from the build stage +# Copy built files from the build stage to Nginx's HTML directory COPY --from=build-stage /app/build /usr/share/nginx/html -# Expose port 8080 -EXPOSE 8080 +# Copy custom NGINX configuration +COPY nginx.conf /etc/nginx/nginx.conf -# Start Nginx -CMD ["nginx", "-g", "daemon off;"] +# Command to run Nginx in the foreground +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From 078bb7164af8b8f8317cb9234010b8a31c95310a Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Tue, 19 Mar 2024 20:41:41 -0600 Subject: [PATCH 22/34] updated --- app/caseflow_web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/Dockerfile b/app/caseflow_web/Dockerfile index a7c32aa6f..d14fa1c84 100644 --- a/app/caseflow_web/Dockerfile +++ b/app/caseflow_web/Dockerfile @@ -1,5 +1,5 @@ # Use a smaller base image for the build stage -FROM node:latest AS build-stage +FROM node:14.17.0 AS build-stage # Set working directory WORKDIR /app From f96330274fd539cb3f5d33a6129d820d7329be94 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Wed, 20 Mar 2024 16:36:20 -0600 Subject: [PATCH 23/34] update --- .github/workflows/caseflow_web_os.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/caseflow_web_os.yml b/.github/workflows/caseflow_web_os.yml index b853dcc27..c18b78015 100644 --- a/.github/workflows/caseflow_web_os.yml +++ b/.github/workflows/caseflow_web_os.yml @@ -94,4 +94,4 @@ jobs: - name: Tag+Deploy for ${{ inputs.environment }} shell: bash run: | - oc tag ${{ env.APP_NAME }}:latest ${{ env.APP_NAME }}:${{ inputs.environment }} \ No newline at end of file + oc tag ${{ env.APP_NAME }}-build:latest ${{ env.APP_NAME }}:${{ inputs.environment }} \ No newline at end of file From 154f7c899d4cf4a21d876fc7d919d9b8da463e78 Mon Sep 17 00:00:00 2001 From: nagarajaPC-AOT Date: Wed, 20 Mar 2024 17:43:26 -0700 Subject: [PATCH 24/34] Added config file --- app/caseflow_web/public/config/config.js | 49 ++++++++++++++++++++++++ app/caseflow_web/public/index.html | 1 + 2 files changed, 50 insertions(+) create mode 100644 app/caseflow_web/public/config/config.js diff --git a/app/caseflow_web/public/config/config.js b/app/caseflow_web/public/config/config.js new file mode 100644 index 000000000..d5030bfe5 --- /dev/null +++ b/app/caseflow_web/public/config/config.js @@ -0,0 +1,49 @@ +window["_env_"] = { + // To define project level configuration possible values development, test, production + NODE_ENV: "development", + // Environment Variables for forms-flow-web + + //Keycloak-client-name for web + REACT_APP_KEYCLOAK_WEB_CLIENTID:'case-flow-web', + // Keycloak-client-name for web + REACT_APP_KEYCLOAK_URL_REALM:'forms-flow-ai', + + // Keycloak base URL + REACT_APP_KEYCLOAK_URL:'https://forms-flow-idm-caseflow.aot-technologies.com', + + + // caseflow web Api End point + REACT_APP_CASEFLOW_API_URL:'https://caseflow-core.aot-technologies.com', + + // caseflow Api GraphQL End point + REACT_APP_CASEFLOW_GRAPHQL_API_URL:'https://caseflow-gateway.aot-technologies.com', + + + // default DMS + REACT_APP_CASEFLOW_DMS:3, + + // application name + APPLICATION_NAME:'caseflow.ai', + + // LOB Graphql Base Url + REACT_APP_CASEFLOW_LOB_GRAPHQL_API_URL:'https://caseflow-lob.aot-technologies.com', + // Take Number For Pagination + REACT_APP_PAGINATION_TAKE:10, + + + // Formsflow BPM base url + REACT_APP_FORMSFLOW_URL:'https://forms-flow-bpm-caseflow.aot-technologies.com', + + + // Formsflow Application base url + REACT_APP_FORMSFLOW_APP_URL:'https://forms-flow-forms-caseflow.aot-technologies.com', + + // DMS FILE UPLOAD DIRECT REST URL + REACT_APP_CASEFLOW_DMS_API_URL:'https://caseflow-dms.aot-technologies.com', + + REACT_APP_FORMSFLOW_FORM_URL:'https://forms-flow-api-caseflow.aot-technologies.com', + + REACT_APP_FORMSFLOW_WEB_URL:'https://forms-flow-web-caseflow.aot-technologies.com', + + REACT_APP_GENERIC_NAME : Case + }; \ No newline at end of file diff --git a/app/caseflow_web/public/index.html b/app/caseflow_web/public/index.html index 11aab2f11..a977b737e 100644 --- a/app/caseflow_web/public/index.html +++ b/app/caseflow_web/public/index.html @@ -1,6 +1,7 @@ + From 19e38b782807d5d4d169b4a5e580fe9055adc9b1 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Wed, 20 Mar 2024 21:19:29 -0600 Subject: [PATCH 25/34] update config.js --- app/caseflow_web/public/config/config.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/caseflow_web/public/config/config.js b/app/caseflow_web/public/config/config.js index d5030bfe5..8f60b5171 100644 --- a/app/caseflow_web/public/config/config.js +++ b/app/caseflow_web/public/config/config.js @@ -9,14 +9,14 @@ window["_env_"] = { REACT_APP_KEYCLOAK_URL_REALM:'forms-flow-ai', // Keycloak base URL - REACT_APP_KEYCLOAK_URL:'https://forms-flow-idm-caseflow.aot-technologies.com', + REACT_APP_KEYCLOAK_URL:'https://forms-flow-idm-a358eb-dev.apps.silver.devops.gov.bc.ca', // caseflow web Api End point - REACT_APP_CASEFLOW_API_URL:'https://caseflow-core.aot-technologies.com', + REACT_APP_CASEFLOW_API_URL:'https://caseflow-microservices-server-dev.apps.silver.devops.gov.bc.ca', // caseflow Api GraphQL End point - REACT_APP_CASEFLOW_GRAPHQL_API_URL:'https://caseflow-gateway.aot-technologies.com', + REACT_APP_CASEFLOW_GRAPHQL_API_URL:'https://caseflow-microservices-gateway-dev.apps.silver.devops.gov.bc.ca', // default DMS @@ -26,24 +26,24 @@ window["_env_"] = { APPLICATION_NAME:'caseflow.ai', // LOB Graphql Base Url - REACT_APP_CASEFLOW_LOB_GRAPHQL_API_URL:'https://caseflow-lob.aot-technologies.com', + REACT_APP_CASEFLOW_LOB_GRAPHQL_API_URL:'https://caseflow-microservices-lob-dev.apps.silver.devops.gov.bc.ca', // Take Number For Pagination REACT_APP_PAGINATION_TAKE:10, // Formsflow BPM base url - REACT_APP_FORMSFLOW_URL:'https://forms-flow-bpm-caseflow.aot-technologies.com', + REACT_APP_FORMSFLOW_URL:'https://forms-flow-bpm-a358eb-dev.apps.silver.devops.gov.bc.ca', // Formsflow Application base url - REACT_APP_FORMSFLOW_APP_URL:'https://forms-flow-forms-caseflow.aot-technologies.com', + REACT_APP_FORMSFLOW_APP_URL:'https://forms-flow-forms-a358eb-dev.apps.silver.devops.gov.bc.ca', // DMS FILE UPLOAD DIRECT REST URL - REACT_APP_CASEFLOW_DMS_API_URL:'https://caseflow-dms.aot-technologies.com', + REACT_APP_CASEFLOW_DMS_API_URL:'https://caseflow-microservices-dms-dev.apps.silver.devops.gov.bc.ca', - REACT_APP_FORMSFLOW_FORM_URL:'https://forms-flow-api-caseflow.aot-technologies.com', + REACT_APP_FORMSFLOW_FORM_URL:'https://forms-flow-api-a358eb-dev.apps.silver.devops.gov.bc.ca', - REACT_APP_FORMSFLOW_WEB_URL:'https://forms-flow-web-caseflow.aot-technologies.com', + REACT_APP_FORMSFLOW_WEB_URL:'https://forms-flow-web-a358eb-dev.apps.silver.devops.gov.bc.ca', REACT_APP_GENERIC_NAME : Case }; \ No newline at end of file From 964c94042bd0a5825e490e48949921a192bd162c Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Wed, 20 Mar 2024 21:44:54 -0600 Subject: [PATCH 26/34] update --- app/caseflow_web/public/config/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/public/config/config.js b/app/caseflow_web/public/config/config.js index 8f60b5171..1eb9e33dd 100644 --- a/app/caseflow_web/public/config/config.js +++ b/app/caseflow_web/public/config/config.js @@ -45,5 +45,5 @@ window["_env_"] = { REACT_APP_FORMSFLOW_WEB_URL:'https://forms-flow-web-a358eb-dev.apps.silver.devops.gov.bc.ca', - REACT_APP_GENERIC_NAME : Case + REACT_APP_GENERIC_NAME : 'Case' }; \ No newline at end of file From dc47209d09aa919bfd53f16b2f58c9ba0db5317c Mon Sep 17 00:00:00 2001 From: nagarajaPC-AOT Date: Thu, 21 Mar 2024 12:04:04 -0700 Subject: [PATCH 27/34] config env changes --- app/caseflow_core/microservices/dms/src/main.ts | 2 ++ app/caseflow_core/microservices/gateway/src/main.ts | 7 +++++++ app/caseflow_core/microservices/lob/src/main.ts | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/app/caseflow_core/microservices/dms/src/main.ts b/app/caseflow_core/microservices/dms/src/main.ts index 7536b1ae5..f5d0ecef9 100644 --- a/app/caseflow_core/microservices/dms/src/main.ts +++ b/app/caseflow_core/microservices/dms/src/main.ts @@ -1,4 +1,5 @@ import { NestFactory } from '@nestjs/core'; +import { config } from 'dotenv'; import { Transport } from '@nestjs/microservices'; //_____________________Custom Imports_____________________// @@ -6,6 +7,7 @@ import { Transport } from '@nestjs/microservices'; import { AppModule } from './app.module'; async function bootstrap() { + config(); const app = await NestFactory.create(AppModule); app.connectMicroservice({ diff --git a/app/caseflow_core/microservices/gateway/src/main.ts b/app/caseflow_core/microservices/gateway/src/main.ts index 7af400083..fa618547a 100644 --- a/app/caseflow_core/microservices/gateway/src/main.ts +++ b/app/caseflow_core/microservices/gateway/src/main.ts @@ -1,8 +1,15 @@ import { NestFactory } from '@nestjs/core'; import { AppModule } from './app.module'; +import { config } from 'dotenv'; async function bootstrap() { + config(); const app = await NestFactory.create(AppModule); + app.enableCors({ + origin: true, + methods: 'GET,HEAD,PUT,PATCH,POST,DELETE,OPTIONS', + credentials: true, + }); await app.listen(7000); } bootstrap(); diff --git a/app/caseflow_core/microservices/lob/src/main.ts b/app/caseflow_core/microservices/lob/src/main.ts index 90840b784..01d1b2656 100644 --- a/app/caseflow_core/microservices/lob/src/main.ts +++ b/app/caseflow_core/microservices/lob/src/main.ts @@ -1,10 +1,17 @@ import { ValidationPipe } from '@nestjs/common'; import { NestFactory } from '@nestjs/core'; import { AppModule } from './app.module'; +import { config } from 'dotenv'; async function bootstrap() { + config(); const app = await NestFactory.create(AppModule); app.useGlobalPipes(new ValidationPipe()); + app.enableCors({ + origin: true, + methods: 'GET,HEAD,PUT,PATCH,POST,DELETE,OPTIONS', + credentials: true, + }); await app.listen(8000); } bootstrap(); From 6385ae8fce8c162ef709e7d2f5f4bec50ef1d0a7 Mon Sep 17 00:00:00 2001 From: nagarajaPC-AOT Date: Thu, 21 Mar 2024 15:24:26 -0700 Subject: [PATCH 28/34] added script type in index file --- app/caseflow_web/public/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/caseflow_web/public/index.html b/app/caseflow_web/public/index.html index a977b737e..5a3f8559f 100644 --- a/app/caseflow_web/public/index.html +++ b/app/caseflow_web/public/index.html @@ -1,7 +1,6 @@ - @@ -19,6 +18,8 @@ + + @@ -35,6 +36,7 @@ +
From 7fd3ab0cb089bca8ffc38f946ff78276f99d65db Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Fri, 22 Mar 2024 12:08:12 -0600 Subject: [PATCH 30/34] update kc url --- app/caseflow_web/public/config/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/public/config/config.js b/app/caseflow_web/public/config/config.js index 1eb9e33dd..a4a936e62 100644 --- a/app/caseflow_web/public/config/config.js +++ b/app/caseflow_web/public/config/config.js @@ -9,7 +9,7 @@ window["_env_"] = { REACT_APP_KEYCLOAK_URL_REALM:'forms-flow-ai', // Keycloak base URL - REACT_APP_KEYCLOAK_URL:'https://forms-flow-idm-a358eb-dev.apps.silver.devops.gov.bc.ca', + REACT_APP_KEYCLOAK_URL:'https://socialsector-sso-dev.apps.gov.bc.ca/admin/formsflow-ai/console/', // caseflow web Api End point From 34cfd73d70cf3eefd13c1029c6fc1c54dbd218ba Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Fri, 22 Mar 2024 12:39:07 -0600 Subject: [PATCH 31/34] test --- app/caseflow_web/public/config/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/public/config/config.js b/app/caseflow_web/public/config/config.js index a4a936e62..ea304f8bd 100644 --- a/app/caseflow_web/public/config/config.js +++ b/app/caseflow_web/public/config/config.js @@ -9,7 +9,7 @@ window["_env_"] = { REACT_APP_KEYCLOAK_URL_REALM:'forms-flow-ai', // Keycloak base URL - REACT_APP_KEYCLOAK_URL:'https://socialsector-sso-dev.apps.gov.bc.ca/admin/formsflow-ai/console/', + REACT_APP_KEYCLOAK_URL:'https://socialsector-sso-dev.apps.gov.bc.ca/admin/formsflow-ai/console', // caseflow web Api End point From 75f4f8da1707781efe64ff52895f963c33c48e50 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Fri, 22 Mar 2024 13:33:51 -0600 Subject: [PATCH 32/34] test --- app/caseflow_web/src/constants/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/src/constants/constants.ts b/app/caseflow_web/src/constants/constants.ts index 95b2c2dc7..bd6c9d436 100644 --- a/app/caseflow_web/src/constants/constants.ts +++ b/app/caseflow_web/src/constants/constants.ts @@ -34,7 +34,7 @@ export const KEYCLOAK_URL = (window._env_ && window._env_.REACT_APP_KEYCLOAK_URL) || process.env.REACT_APP_KEYCLOAK_URL; -export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}/auth`; +export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}`; export const CLIENT = (window._env_ && window._env_.REACT_APP_CLIENT_ROLE) || process.env.REACT_APP_CLIENT_ROLE || From 7e3af08725d8aeed96707520c5140b364e29794d Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Fri, 22 Mar 2024 14:40:56 -0600 Subject: [PATCH 33/34] update --- app/caseflow_web/public/config/config.js | 2 +- app/caseflow_web/src/constants/constants.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/caseflow_web/public/config/config.js b/app/caseflow_web/public/config/config.js index ea304f8bd..1eb9e33dd 100644 --- a/app/caseflow_web/public/config/config.js +++ b/app/caseflow_web/public/config/config.js @@ -9,7 +9,7 @@ window["_env_"] = { REACT_APP_KEYCLOAK_URL_REALM:'forms-flow-ai', // Keycloak base URL - REACT_APP_KEYCLOAK_URL:'https://socialsector-sso-dev.apps.gov.bc.ca/admin/formsflow-ai/console', + REACT_APP_KEYCLOAK_URL:'https://forms-flow-idm-a358eb-dev.apps.silver.devops.gov.bc.ca', // caseflow web Api End point diff --git a/app/caseflow_web/src/constants/constants.ts b/app/caseflow_web/src/constants/constants.ts index bd6c9d436..95b2c2dc7 100644 --- a/app/caseflow_web/src/constants/constants.ts +++ b/app/caseflow_web/src/constants/constants.ts @@ -34,7 +34,7 @@ export const KEYCLOAK_URL = (window._env_ && window._env_.REACT_APP_KEYCLOAK_URL) || process.env.REACT_APP_KEYCLOAK_URL; -export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}`; +export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}/auth`; export const CLIENT = (window._env_ && window._env_.REACT_APP_CLIENT_ROLE) || process.env.REACT_APP_CLIENT_ROLE || From dc9e97f62ddda34485e139cf1f74d9316e454e90 Mon Sep 17 00:00:00 2001 From: sakthi-aot Date: Fri, 22 Mar 2024 15:54:41 -0600 Subject: [PATCH 34/34] update --- app/caseflow_web/src/constants/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/caseflow_web/src/constants/constants.ts b/app/caseflow_web/src/constants/constants.ts index 95b2c2dc7..bd6c9d436 100644 --- a/app/caseflow_web/src/constants/constants.ts +++ b/app/caseflow_web/src/constants/constants.ts @@ -34,7 +34,7 @@ export const KEYCLOAK_URL = (window._env_ && window._env_.REACT_APP_KEYCLOAK_URL) || process.env.REACT_APP_KEYCLOAK_URL; -export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}/auth`; +export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}`; export const CLIENT = (window._env_ && window._env_.REACT_APP_CLIENT_ROLE) || process.env.REACT_APP_CLIENT_ROLE ||