(WIP)

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

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
+
+# -------------------------------------------------------------

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

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: