From e829300c2338a007956726466639e61ad4e365c5 Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:11:40 +0530 Subject: [PATCH 01/10] Update Dcker file and nginx according to choreo --- Dockerfile | 32 ++++++++++++++++++++++++-------- nginx/nginx.conf | 42 +++++++++++++++++++++++++++++++----------- 2 files changed, 55 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4fd495..6524ffc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,39 @@ # build environment -FROM node:14.17.5-alpine as build +FROM node:14.19.0-alpine3.15 as build WORKDIR /app ENV PATH /app/node_modules/.bin:$PATH COPY package.json /app/package.json -RUN apk add --no-cache git +RUN apk update && apk upgrade && \ + apk add --no-cache bash git openssh RUN npm install --production +RUN npm install react-scripts@3.0.1 -g --silent COPY . /app # set baseurl to get connected with backend API -ARG SERVER_URL=http://localhost:9000/ - -ENV REACT_APP_SERVER_URL=$SERVER_URL RUN npm run build --if-present # host environment -FROM nginx:1.16.0-alpine +FROM nginx:1.25.1-alpine + +# Update and upgrade Alpine packages +RUN apk update && apk upgrade + COPY --from=build /app/build /usr/share/nginx/html RUN rm /etc/nginx/conf.d/default.conf -COPY nginx/nginx.conf /etc/nginx/conf.d -EXPOSE 80 +COPY nginx/nginx.conf /etc/nginx/nginx.conf + +# Create necessary directories and set permissions +RUN mkdir -p /tmp/nginx /var/cache/nginx /var/run /var/log/nginx && \ + chown -R 10014:10014 /tmp/nginx /var/cache/nginx /var/run /var/log/nginx /usr/share/nginx/html && \ + chmod -R 755 /tmp/nginx /var/cache/nginx /var/run /var/log/nginx /usr/share/nginx/html + +# Create a non-root user +RUN adduser -D -u 10014 choreouser + +# Switch to the non-root user +USER 10014 + +EXPOSE 8080 + CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 758a646..e48ac73 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,17 +1,37 @@ -server { +worker_processes auto; +error_log /dev/stdout info; +pid /tmp/nginx.pid; - listen 80; +events { + worker_connections 1024; +} - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ /index.html; - } +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; - error_page 500 502 503 504 /50x.html; + access_log /dev/stdout; + server_tokens off; - location = /50x.html { - root /usr/share/nginx/html; - } + 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; + server { + listen 8080; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + } + + error_page 500 502 503 504 /50x.html; + + location = /50x.html { + root /usr/share/nginx/html; + } + } } \ No newline at end of file From 5cad65b64bace64b8587ae41ef8a1b38b63c32f3 Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Wed, 4 Sep 2024 19:26:42 +0530 Subject: [PATCH 02/10] Updade package and docker file ro resolve module issues --- Dockerfile | 4 ++-- package.json | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6524ffc..cceef01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ ENV PATH /app/node_modules/.bin:$PATH COPY package.json /app/package.json RUN apk update && apk upgrade && \ apk add --no-cache bash git openssh -RUN npm install --production -RUN npm install react-scripts@3.0.1 -g --silent +RUN npm cache clean --force +RUN npm install --silent COPY . /app # set baseurl to get connected with backend API diff --git a/package.json b/package.json index c2dcec5..5b6b361 100644 --- a/package.json +++ b/package.json @@ -35,10 +35,12 @@ "react-force-graph": "^1.41.12", "react-quill": "^2.0.0-beta.4", "react-router-dom": "^6.2.2", - "react-scripts": "^5.0.0", + "react-scripts": "4.0.3", "react-spinners": "^0.11.0", "three-spritetext": "^1.6.5", - "web-vitals": "^2.1.4" + "web-vitals": "^2.1.4", + "ajv": "^6.12.6", + "ajv-keywords": "^3.5.2" }, "scripts": { "start": "react-scripts start", From 33e6e56fe20e0e68716f0c75cce3dc93edcbf9fc Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Wed, 4 Sep 2024 20:06:22 +0530 Subject: [PATCH 03/10] Update dockerfile and packge to resolve build failures --- Dockerfile | 2 +- package.json | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cceef01..6c3bbf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY package.json /app/package.json RUN apk update && apk upgrade && \ apk add --no-cache bash git openssh RUN npm cache clean --force -RUN npm install --silent +RUN npm install --silent --legacy-peer-deps COPY . /app # set baseurl to get connected with backend API diff --git a/package.json b/package.json index 5b6b361..ed13cc3 100644 --- a/package.json +++ b/package.json @@ -35,12 +35,16 @@ "react-force-graph": "^1.41.12", "react-quill": "^2.0.0-beta.4", "react-router-dom": "^6.2.2", - "react-scripts": "4.0.3", + "react-scripts": "^5.0.0", "react-spinners": "^0.11.0", "three-spritetext": "^1.6.5", "web-vitals": "^2.1.4", "ajv": "^6.12.6", - "ajv-keywords": "^3.5.2" + "ajv-keywords": "^3.5.2", + "@babel/core": "^7.16.0", + "@babel/preset-env": "^7.16.0", + "@babel/preset-react": "^7.16.0", + "babel-loader": "^8.2.3" }, "scripts": { "start": "react-scripts start", From bec7ac5d971f54bfea09a5644cf81235b32cfdbf Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Wed, 4 Sep 2024 20:29:29 +0530 Subject: [PATCH 04/10] Update package --- Dockerfile | 4 +++- package.json | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6c3bbf3..c1e34e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,10 @@ ENV PATH /app/node_modules/.bin:$PATH COPY package.json /app/package.json RUN apk update && apk upgrade && \ apk add --no-cache bash git openssh -RUN npm cache clean --force + +# Install dependencies with legacy peer deps RUN npm install --silent --legacy-peer-deps + COPY . /app # set baseurl to get connected with backend API diff --git a/package.json b/package.json index ed13cc3..2ca1038 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,9 @@ "@babel/preset-react": "^7.16.0", "babel-loader": "^8.2.3" }, + "devDependencies": { + "react-scripts": "^5.0.0" + }, "scripts": { "start": "react-scripts start", "build": "react-scripts build", From cb9993a06986189c3c58ed64b4b41154de4c3040 Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:06:13 +0530 Subject: [PATCH 05/10] Update Dockerfile with server URL --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index c1e34e0..757a2e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,9 @@ COPY . /app # set baseurl to get connected with backend API RUN npm run build --if-present +ARG SERVER_URL=https://f2c7f522-ef47-48ce-a429-3fc2f15d2011-copilote1.e1-us-east-azure.choreoapis.dev/ldf/gig-backend/v1.0 + +ENV REACT_APP_SERVER_URL=$SERVER_URL # host environment FROM nginx:1.25.1-alpine From 10ad085346087fc8a87580bf7492d54d84dd86ff Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:06:35 +0530 Subject: [PATCH 06/10] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 757a2e0..f1d8fbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,9 +12,9 @@ RUN npm install --silent --legacy-peer-deps COPY . /app # set baseurl to get connected with backend API +ARG SERVER_URL=https://f2c7f522-ef47-48ce-a429-3fc2f15d2011-copilote1.e1-us-east-azure.choreoapis.dev/ldf/gig-backend/v1.0 RUN npm run build --if-present -ARG SERVER_URL=https://f2c7f522-ef47-48ce-a429-3fc2f15d2011-copilote1.e1-us-east-azure.choreoapis.dev/ldf/gig-backend/v1.0 ENV REACT_APP_SERVER_URL=$SERVER_URL From 628d67ba6380e357ffee109f3d0dc43cb7150933 Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:07:38 +0530 Subject: [PATCH 07/10] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1d8fbc..7699470 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,10 @@ COPY . /app # set baseurl to get connected with backend API ARG SERVER_URL=https://f2c7f522-ef47-48ce-a429-3fc2f15d2011-copilote1.e1-us-east-azure.choreoapis.dev/ldf/gig-backend/v1.0 -RUN npm run build --if-present - ENV REACT_APP_SERVER_URL=$SERVER_URL +RUN npm run build --if-present + # host environment FROM nginx:1.25.1-alpine From 4931e47e1413fcf32c02b49a7c2ecb93ce1bb448 Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:12:58 +0530 Subject: [PATCH 08/10] Update Dockerfile with server url --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7699470..8d73757 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN npm install --silent --legacy-peer-deps COPY . /app # set baseurl to get connected with backend API -ARG SERVER_URL=https://f2c7f522-ef47-48ce-a429-3fc2f15d2011-copilote1.e1-us-east-azure.choreoapis.dev/ldf/gig-backend/v1.0 +ARG SERVER_URL=https://f2c7f522-ef47-48ce-a429-3fc2f15d2011-copilote1.e1-us-east-azure.choreoapis.dev/ldf/gig-backend/v1.0/ ENV REACT_APP_SERVER_URL=$SERVER_URL From f10faffa51ae6327a3cb3245acba59c67114fe0c Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:39:21 +0530 Subject: [PATCH 09/10] Remove server URL from the dockerfile --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d73757..e41e48f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,6 @@ RUN npm install --silent --legacy-peer-deps COPY . /app -# set baseurl to get connected with backend API -ARG SERVER_URL=https://f2c7f522-ef47-48ce-a429-3fc2f15d2011-copilote1.e1-us-east-azure.choreoapis.dev/ldf/gig-backend/v1.0/ - -ENV REACT_APP_SERVER_URL=$SERVER_URL - RUN npm run build --if-present # host environment From 3edabdc008178d23e297b82420cc45658a74b0a0 Mon Sep 17 00:00:00 2001 From: Visal Munasinghe <127712545+vish-mv@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:23:02 +0530 Subject: [PATCH 10/10] Update configs --- public/index.html | 2 ++ src/setupProxy.js | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 5e821f1..8d54138 100644 --- a/public/index.html +++ b/public/index.html @@ -3,6 +3,8 @@ + +