testing import

uc-cdis · Dec 24, 2024 · 9b8bd74 · 9b8bd74
1 parent 57f1233
commit 9b8bd74
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 52 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 #   docker run -v ~/.gen3/fence/fence-config.yaml:/var/www/fence/fence-config.yaml -v ./keys/:/fence/keys/ fence:latest
 # To check running container do: docker exec -it CONTAINER bash
 
-ARG AZLINUX_BASE_VERSION=feat_python-nginx
+ARG AZLINUX_BASE_VERSION=master
 
 # ------ Base stage ------
 FROM quay.io/cdis/python-nginx-al:${AZLINUX_BASE_VERSION} AS base

diff --git a/fence/__init__.py b/fence/__init__.py
@@ -21,10 +21,13 @@
 from fence.config import config
 from fence.settings import CONFIG_SEARCH_FOLDERS
 
-config.load(
-    config_path=os.environ.get("FENCE_CONFIG_PATH"),
-    search_folders=CONFIG_SEARCH_FOLDERS,
-)
+try:
+    config.load(
+        config_path=os.environ.get("FENCE_CONFIG_PATH"),
+        search_folders=CONFIG_SEARCH_FOLDERS,
+    )
+except Exception as e:
+    print("fence configuration load error " + str(e))
 
 from fence.auth import logout, build_redirect_url
 from fence.metrics import metrics

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ cached_property = "^1.5.1"
 cdiserrors = "<2.0.0"
 cdislogging = "^1.0.0"
 cdispyutils = "^2.0.1"
-flask = "^2.2.3"
+flask = ">=3.0.0"
 cryptography = ">=42.0.5"
 flask-cors = "<6"
 flask-restful = ">=0.3.8"