Merge pull request 'Refactored compose file to include the ui in deployment' (#30) from endpoints into main

Reviewed-on: #30

PostFundManagement.Api/Program.cs

@@ -92,10 +92,7 @@ builder.Services.AddOpenApi(options =>
 });
 
 builder.Services.AddCors(options => options.AddPolicy("AllowFrontend", policy => 
-    policy.WithOrigins("https://localhost:3000", "https://localhost:8076", "https://console.ifri.khongisa.co.za")
+    policy.WithOrigins("https://localhost:3000").AllowAnyHeader().AllowAnyMethod().AllowCredentials()));
-          .AllowAnyHeader()
-          .AllowAnyMethod()
-          .AllowCredentials()));
 
 var app = builder.Build();
 

PostFundManagement.ConsoleUI/Dockerfile

@@ -3,34 +3,29 @@ FROM node:20-alpine AS builder
 
 WORKDIR /app
 
-# Enable corepack to use Yarn
+# Copy dependency definitions
-RUN corepack enable
+COPY package*.json ./
 
-# Copy dependency definitions from the subdirectory
+# Install dependencies
-COPY PostFundManagement.ConsoleUI/package*.json PostFundManagement.ConsoleUI/yarn.lock* ./
+RUN npm ci || npm install
 
-# Install dependencies via Yarn
+# Copy application source
-RUN yarn install --frozen-lockfile || yarn install
+COPY . .
-
-# Copy application source from the subdirectory
-COPY PostFundManagement.ConsoleUI/ ./
 
 # Build Vite application for production
-RUN yarn build
+RUN npm run build
 
 # Stage 2: Production Nginx Server
 FROM nginx:alpine
 
-WORKDIR /usr/share/nginx/html
+# Copy nginx configuration
-
+COPY nginx.conf /etc/nginx/conf.d/default.conf
-# Copy nginx configuration from stage 1 build directory
-COPY --from=builder /app/nginx.conf /etc/nginx/conf.d/default.conf
 
 # Copy compiled static assets from build stage
-COPY --from=builder /app/dist ./
+COPY --from=builder /app/dist /usr/share/nginx/html
 
 # Copy entrypoint script for dynamic runtime environment variables
-COPY --from=builder /app/docker-entrypoint.sh /docker-entrypoint.sh
+COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
 # Expose port 3000

docker-compose.yml

@@ -67,8 +67,7 @@ services:
       
       # Redis overrides 
       - ConnectionStrings__Redis=${REDIS_CONNECTION_STRING:-192.168.1.171:6379,ssl=false,abortConnect=false}
-  pfm-console:
+    pfm-console:
-    image: pfm-console
     build:
       context: .
       dockerfile: PostFundManagement.ConsoleUI/Dockerfile
@@ -77,10 +76,10 @@ services:
       - "8076:3000"
     environment:
       # OIDC Identity Provider Configuration
-      - OIDC_AUTHORITY=${OIDC_AUTHORITY:-https://}
+      - OIDC_AUTHORITY=${OIDC_AUTHORITY}
-      - OIDC_AUDIENCE=${OIDC_AUDIENCE:-aud}
+      - OIDC_AUDIENCE=${OIDC_AUDIENCE}
-      - OIDC_CLIENT_ID=${OIDC_CLIENT_ID:-clientid}
+      - OIDC_CLIENT_ID=${OIDC_CLIENT_ID}
-      - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET:-yoursecret}
+      - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET}
       # Backend API Configuration
-      - API_BASE_URL=${API_BASE_URL:-https://api.ifri.khongisa.co.za/}
+      - API_BASE_URL=${API_BASE_URL}
     restart: unless-stopped