From 330bb012931b43149efda13334b41007666a1d33 Mon Sep 17 00:00:00 2001
From: Grzegorz Siewruk <gsiewruk@gmail.com>
Date: Wed, 11 Dec 2024 22:05:38 +0100
Subject: [PATCH] changes

---
 docker-compose.yml             |  7 +++++++
 frontend/angular.json          |  3 +++
 frontend/nginx/proxy.conf.json | 14 ++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8e55789..898b405 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,13 @@ services:
       - dependency_track_data:/root/.dependency-track
     depends_on:
       - flowdb
+    restart: always  # Add this line
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:8080" ]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
 
   flowdb:
     image: postgres:latest
diff --git a/frontend/angular.json b/frontend/angular.json
index 99f7889..1dbbd3e 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -73,6 +73,9 @@
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "proxyConfig": "nginx/proxy.conf.json"
+          },
           "configurations": {
             "production": {
               "buildTarget": "coreui-free-angular-admin-template:build:production"
diff --git a/frontend/nginx/proxy.conf.json b/frontend/nginx/proxy.conf.json
index e69de29..eab5a56 100644
--- a/frontend/nginx/proxy.conf.json
+++ b/frontend/nginx/proxy.conf.json
@@ -0,0 +1,14 @@
+{
+  "/api": {
+    "target": "http://localhost:8888",
+    "secure": false,
+    "changeOrigin": true,
+    "pathRewrite": { "^/api": "/api" }
+  },
+  "/oauth2": {
+    "target": "http://localhost:8888",
+    "secure": false,
+    "changeOrigin": true,
+    "pathRewrite": { "^/oauth2": "/oauth2" }
+  }
+}
\ No newline at end of file