Feature/marp 224 create dockerfile for deployment of marketplace

marketplace-build/config/nginx/nginx.conf

@@ -4,12 +4,25 @@ http {
     include /etc/nginx/mime.types;
 
     server {
+        listen 80;
+        server_name marketplace;
 
         root /usr/share/nginx/html;
         index index.html;
 
         location / {
             try_files $uri $uri/ /index.html;
         }
+
+        location /marketplace-service {
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-NginX-Proxy true;
+            proxy_pass http://service:8080/marketplace-service;
+            proxy_ssl_session_reuse off;
+            proxy_set_header Host $http_host;
+            proxy_cache_bypass $http_upgrade;
+            proxy_redirect off;
+        }
     }
 }

marketplace-build/docker-compose.yml

@@ -2,7 +2,7 @@ name: marketplace
 
 services:
   mongodb:
-    container_name: marketplace-mongodb-7.0.0
+    container_name: marketplace-mongodb
     build:
       context: ./config/mongodb
       dockerfile: Dockerfile
@@ -54,4 +54,4 @@ services:
       - mongodb
 
 volumes:
-  mongodata:
+  mongodata:

marketplace-ui/Dockerfile

@@ -6,6 +6,6 @@ RUN npm install
 RUN npm run build --prod
 
 # Stage 2: Serve Angular app using Nginx
-FROM nginx:alpine
+FROM nginx
 COPY --from=build-angular /app/dist/browser /usr/share/nginx/html
 COPY --from=assets config/nginx/nginx.conf /etc/nginx/nginx.conf

marketplace-ui/src/app/auth/auth.service.ts

@@ -28,7 +28,7 @@ export class AuthService {
   private readonly BASE_URL = environment.apiUrl;
   private readonly TOKEN_KEY = 'token';
   private readonly githubAuthUrl = 'https://github.com/login/oauth/authorize';
-  private readonly githubAuthCallbackPath = environment.githubAuthCallbackPath;
+  private readonly githubAuthCallbackUrl = window.location.origin + environment.githubAuthCallbackPath;
 
   constructor(
     private readonly http: HttpClient,
@@ -38,8 +38,7 @@ export class AuthService {
 
   redirectToGitHub(originalUrl: string): void {
     const state = encodeURIComponent(originalUrl);
-    const githubAuthCallbackUrl = window.location.origin + this.githubAuthCallbackPath;
-    const authUrl = `${this.githubAuthUrl}?client_id=${environment.githubClientId}&redirect_uri=${githubAuthCallbackUrl}&state=${state}`;
+    const authUrl = `${this.githubAuthUrl}?client_id=${environment.githubClientId}&redirect_uri=${this.githubAuthCallbackUrl}&state=${state}`;
     window.location.href = authUrl;
   }
 

marketplace-ui/src/app/core/interceptors/api.interceptor.ts

@@ -24,7 +24,7 @@ export const apiInterceptor: HttpInterceptorFn = (req, next) => {
   }
   let requestURL = req.url;
   const apiURL = environment.apiUrl;
-  if (!requestURL.startsWith(apiURL)) {
+  if (!requestURL.includes(apiURL)) {
     requestURL = `${apiURL}/${req.url}`;
   }
 

marketplace-ui/src/environments/environment.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-  apiUrl: 'http://marketplace.server.ivy-cloud.com:8080/marketplace-service',
+  apiUrl: '/marketplace-service',
   githubClientId: 'Ov23liVMliBxBqdQ7FnG',
   githubAuthCallbackPath: '/auth/github/callback',
   dayInMiliseconds: 86400000