From 1f357c070997920b6315c06bbdf42b4d4a438273 Mon Sep 17 00:00:00 2001
From: Thomas Hanke <thomas.hanke@iwm.fraunhofer.de>
Date: Wed, 28 Aug 2024 11:28:20 +0200
Subject: [PATCH] fixed server url issue

---
 app.py                     | 2 +-
 docker-compose.develop.yml | 6 ++++--
 docker-compose.yml         | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app.py b/app.py
index a752035..d53676b 100644
--- a/app.py
+++ b/app.py
@@ -130,7 +130,7 @@ def get_flashed_messages(request: fastapi.Request):
     swagger_ui_parameters={"syntaxHighlight": False},
     middleware=middleware,
     servers=[
-        {"url": setting.server + "/api", "description": "Production environment"},
+        {"url": setting.server, "description": "Production environment"},
     ],
     # root_path="/api/v1",
     root_path_in_servers=False,
diff --git a/docker-compose.develop.yml b/docker-compose.develop.yml
index 8a98224..fbc3582 100644
--- a/docker-compose.develop.yml
+++ b/docker-compose.develop.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   csvtocsvw:
     image: "ghcr.io/mat-o-lab/csvtocsvw:latest"
@@ -9,8 +8,11 @@ services:
     networks:
       - csvtocsvw_net
     environment:
-      APP_MODE: "development"
+      APP_PORT: 6001
+      APP_SECRET: ${APP_SECRET}
+      SERVER_URL: "http://docker-dev.iwm.fraunhofer.de:${APP_PORT}"
       ADMIN_MAIL: ${ADMIN_MAIL}
+      APP_MODE: "development"
     volumes:
       - ./:/src
     entrypoint: "python app.py"
diff --git a/docker-compose.yml b/docker-compose.yml
index 8505fbc..d3818ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,13 @@
-version: "3"
 services:
   csvtocsvw:
     image: "ghcr.io/mat-o-lab/csvtocsvw:latest"
     container_name: "csvtocsvw"
     environment:
-      APP_MODE: "production"
+      APP_PORT: 6001
+      APP_SECRET: ${APP_SECRET}
+      SERVER_URL: "http://docker-dev.iwm.fraunhofer.de:${APP_PORT}"
       ADMIN_MAIL: ${ADMIN_MAIL}
+      APP_MODE: "production"
     ports:
       - ${APP_PORT}:5000
     restart: always