Simplification of environment variables

Author: Maximilian Csuk

.env

@@ -2,26 +2,23 @@ frontend_image=ghcr.io/max-bytes/omnikeeper/variants/frontend/internal
 frontend_tag=latest
 backend_image=ghcr.io/max-bytes/omnikeeper/variants/backend/internal
 backend_tag=latest
-http_port=9080
+
+http_port_frontend=9080
 http_port_backend=9090
+
 url_omnikeeper=http://localhost
-aspnetcore_environment=Production
+
 db_user=postgres
 db_password=postgres
 db_database=omnikeeper
 db_management_port=4543
-authentication_audience=landscape-omnikeeper
-authentication_authority=https://auth-dev.mhx.at/auth/realms/acme
-#keycloak_url=https://auth-dev.mhx.at
-#keycloak_realm=acme
-#keycloak_clientid=landscape-omnikeeper
-#keycloak_clientsecret=
+
 #keycloak_url=https://keycloak:9095
 keycloak_url=https://auth-dev.mhx.at
+keycloak_client=landscape-omnikeeper
 keycloak_realm=acme
-keycloak_clientid=landscape-omnikeeper
-keycloak_clientsecret=
 keycloak_port=9095
+
 http_port_dbadmin=9099
 pgadmin_email=abc@abc.com
 pgadmin_password=123123

docker-compose.yml

@@ -3,16 +3,13 @@ services:
   frontend:
     image: ${frontend_image}:${frontend_tag}
     ports:
-      - ${http_port}:80
+      - ${http_port_frontend}:80
     volumes:
       - ./logs/frontend/nginx:/var/log/nginx
     environment:
-      NODE_ENV: production
-      PUBLIC_URL_DYNAMIC: ${url_omnikeeper}:${http_port}
-      REACT_APP_BASE_NAME: /
-      REACT_APP_KEYCLOAK_URL: ${keycloak_url}/auth/
+      PUBLIC_URL_DYNAMIC: ${url_omnikeeper}:${http_port_frontend}
+      REACT_APP_KEYCLOAK_URL: ${keycloak_url}
       REACT_APP_KEYCLOAK_REALM: ${keycloak_realm}
-      REACT_APP_KEYCLOAK_RESOURCE: ${keycloak_realm}
       REACT_APP_KEYCLOAK_CLIENT_ID: landscape-omnikeeper
       REACT_APP_BACKEND_URL: ${url_omnikeeper}:${http_port_backend}
     depends_on:
@@ -25,19 +22,11 @@ services:
     volumes:
       - ./logs/backend:/app/Logs
     environment:
-      - ASPNETCORE_ENVIRONMENT=${aspnetcore_environment}
-      - ASPNETCORE_URLS=http://+:80
-      - DOTNET_RUNNING_IN_CONTAINER=true
       - ConnectionStrings__LandscapeDatabaseConnection=Server=db;User Id=${db_user};Password=${db_password};Database=${db_database};Pooling=true
       - ConnectionStrings__HangfireConnection=Server=db;User Id=${db_user};Password=${db_password};Database=${db_database};Pooling=true
-      - Authentication__Audience=${authentication_audience}
-      - Authentication__Authority=${authentication_authority}
-      - Keycloak__URL=${keycloak_url}
-      - Keycloak__Realm=${keycloak_realm}
-      - Keycloak__ClientID=${keycloak_clientid}
-      - Keycloak__ClientSecret=${keycloak_clientsecret}
-      - CORS__AllowedHosts=${url_omnikeeper}:${http_port}
-      - BaseURL=
+      - Authentication__Audience=${keycloak_client}
+      - Authentication__Authority=${keycloak_url}/auth/realms/${keycloak_realm}
+      - CORS__AllowedHosts=${url_omnikeeper}:${http_port_frontend}
 
     depends_on:
       - db