From d29c1183d8c0dab00fb20580ed7eba087ea85b99 Mon Sep 17 00:00:00 2001
From: Norman Schmidt <nosuman@protonmail.com>
Date: Sun, 25 Sep 2022 15:48:28 +0200
Subject: [PATCH] (WIP)

---
 c4po.sh                              | 16 ++++------------
 security-c4po-angular/Dockerfile     |  6 ++----
 security-c4po-cfg/cfg/keycloak.env   |  2 ++
 security-c4po-cfg/docker-compose.yml |  4 ++--
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/c4po.sh b/c4po.sh
index d9b6bcd..f21a464 100755
--- a/c4po.sh
+++ b/c4po.sh
@@ -2,16 +2,10 @@
 baseDir=$(pwd)
 
 composeDir=$baseDir"/security-c4po-cfg"
+compose=$baseDir"/security-c4po-cfg/docker-compose.yml"
 keycloakVolume="security-c4po-cfg/volumes/keycloak/data/*"
 mongoVolume="security-c4po-cfg/volumes/mongodb/data/*"
 
-composeKeycloak=$baseDir"/security-c4po-cfg/kc/docker-compose.keycloak.yml"
-composeDatabase=$baseDir"/security-c4po-cfg/mongodb/docker-compose.mongodb.yml"
-composeFrontend=$baseDir"/security-c4po-cfg/frontend/docker-compose.frontend.yml"
-composeBackend=$baseDir"/security-c4po-cfg/backend/docker-compose.backend.yml"
-
-compose=$baseDir"/security-c4po-cfg/docker-compose.yml"
-
 echo -e "
 _______ _______ _______ _     _  ______ _____ _______ __   __
 |______ |______ |       |     | |_____/   |      |      \_/
@@ -34,14 +28,12 @@ echo -e "\n"
 echo "-----------------Start Build------------------"
 echo -e "\n"
 echo " - Backend: "
-docker-compose -f ${composeBackend} build
+docker-compose -f ${compose} build c4po-api
 echo -e "\n"
 echo " - Frontend: "
-docker-compose -f ${composeFrontend} build
+#docker-compose -f ${compose} build c4po-angular
 echo -e "\n"
-# docker-compose -f ${compose} up
 
 echo "------------Start Docker Container------------"
 echo -e "\n"
-docker-compose -f ${composeKeycloak} -f ${composeDatabase} -f ${composeBackend} -f ${composeFrontend} up
-# docker-compose -f ${compose} up
+ docker-compose -f ${compose} up # --scale c4po-angular=0
diff --git a/security-c4po-angular/Dockerfile b/security-c4po-angular/Dockerfile
index d963d8b..c1f569b 100644
--- a/security-c4po-angular/Dockerfile
+++ b/security-c4po-angular/Dockerfile
@@ -7,10 +7,6 @@ WORKDIR /app
 # add `/app/node_modules/.bin` to $PATH
 ENV PATH /app/node_modules/.bin:$PATH
 
-# increase memory limit to avoid "heap out of memory"-error
-# TODO investigate on root cause for "heap out of memory"-error
-ENV NODE_OPTIONS="--max_old_space_size=4096"
-
 # install and cache app dependencies
 COPY package.json /app/package.json
 RUN npm install
@@ -21,3 +17,5 @@ COPY . /app
 
 # start app
 CMD ng serve -c compose --host 0.0.0.0
+
+# -------------------------------------------------------------
diff --git a/security-c4po-cfg/cfg/keycloak.env b/security-c4po-cfg/cfg/keycloak.env
index f57f56b..2a5f87a 100644
--- a/security-c4po-cfg/cfg/keycloak.env
+++ b/security-c4po-cfg/cfg/keycloak.env
@@ -7,3 +7,5 @@ DB_PASSWORD=Test1234!
 KEYCLOAK_USER=admin
 KEYCLOAK_PASSWORD=admin
 KEYCLOAK_IMPORT=/tmp/c4po_realm_export.json
+KEYCLOAK_FRONTEND_URL=http://localhost:8888/auth
+#PROXY_ADDRESS_FORWARDING=true
diff --git a/security-c4po-cfg/docker-compose.yml b/security-c4po-cfg/docker-compose.yml
index a6ad1d7..1805d23 100644
--- a/security-c4po-cfg/docker-compose.yml
+++ b/security-c4po-cfg/docker-compose.yml
@@ -54,7 +54,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "1G"
+          memory: "2G"
     ports:
       - 4200:4200
     networks:
@@ -72,7 +72,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "1G"
+          memory: "2G"
     ports:
       - 8443:8443
     networks: