pull config.yml from /etc/hsds/ if /config/config.yml not found

HDFGroup · May 21, 2020 · 5b7a0f1 · 5b7a0f1
1 parent bda977f
commit 5b7a0f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,9 @@ MAINTAINER John Readey <jreadey@hdfgroup.org>
 RUN mkdir /usr/local/src/hsds-src/ /usr/local/src/hsds/
 COPY . /usr/local/src/hsds-src
 RUN pip install /usr/local/src/hsds-src/ --no-deps
+RUN rm -rf /usr/local/src/hsds-src
+RUN mkdir /etc/hsds/
+COPY admin/config/config.yml /etc/hsds/
 COPY entrypoint.sh  /
 
 EXPOSE 5100-5999

diff --git a/hsds/config.py b/hsds/config.py
@@ -19,7 +19,7 @@ def _load_cfg():
 
     # load config yaml
     yml_file = None
-    for config_dir in [".", "/config"]:
+    for config_dir in [".", "/config", "/etc/hsds/"]:
         file_name = os.path.join(config_dir, "config.yml")
         if os.path.isfile(file_name):
             yml_file = file_name
@@ -28,7 +28,7 @@ def _load_cfg():
         msg = "unable to find config file"
         print(msg)
         raise FileNotFoundError(msg)
-    print(f"_load_cfg with '{yml_file}''")
+    print(f"_load_cfg with '{yml_file}'")
     try:
         with open(yml_file, "r") as f:
             yml_config = yaml.safe_load(f)