diff --git a/Dockerfile b/Dockerfile index 8685061b0b..efbecf23a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -225,9 +225,9 @@ RUN touch .env-secrets # Some services have default env files that live under their code directories # These should also be readable from the relative current path -COPY crates/service/job/download_job/download-job.env . -COPY crates/service/job/inference_job/inference-job.env . -COPY crates/service/web/storyteller_web/storyteller-web.env . +COPY crates/service/job/download_job/config/download-job.env . +COPY crates/service/job/inference_job/config/inference-job.env . +COPY crates/service/web/storyteller_web/config/storyteller-web.env . EXPOSE 8080 CMD LD_LIBRARY_PATH=/usr/lib /storyteller-web diff --git a/crates/service/job/download_job/download-job.env b/crates/service/job/download_job/config/download-job.env similarity index 100% rename from crates/service/job/download_job/download-job.env rename to crates/service/job/download_job/config/download-job.env diff --git a/crates/service/job/download_job/src/main.rs b/crates/service/job/download_job/src/main.rs index 19c8146693..bb1206c0c9 100644 --- a/crates/service/job/download_job/src/main.rs +++ b/crates/service/job/download_job/src/main.rs @@ -66,11 +66,11 @@ async fn main() -> AnyhowResult<()> { let _ = envvar::read_from_filename_and_paths( "download-job.env", - &[".", "crates/service/job/download_job"])?; + &[".", "./config", "crates/service/job/download_job/config"])?; let _ = envvar::read_from_filename_and_paths( "download-job-secrets.env", - &[".", "crates/service/job/download_job"] + &[".", "./config", "crates/service/job/download_job/config"] ).map_err(|err| { // NB: Fail open. warn!("Could not load app-specific secrets from env file (this might be fine, eg. provided by k8s): {:?}", err); diff --git a/crates/service/job/inference_job/inference-job.env b/crates/service/job/inference_job/config/inference-job.env similarity index 100% rename from crates/service/job/inference_job/inference-job.env rename to crates/service/job/inference_job/config/inference-job.env diff --git a/crates/service/job/inference_job/src/main.rs b/crates/service/job/inference_job/src/main.rs index 566b585dda..2e762646cc 100644 --- a/crates/service/job/inference_job/src/main.rs +++ b/crates/service/job/inference_job/src/main.rs @@ -80,11 +80,11 @@ async fn main() -> AnyhowResult<()> { let _ = envvar::read_from_filename_and_paths( "inference-job.env", - &[".", "crates/service/job/inference_job"])?; + &[".", "./config", "crates/service/job/inference_job/config"])?; let _ = envvar::read_from_filename_and_paths( "inference-job-secrets.env", - &[".", "crates/service/job/inference_job"] + &[".", "./config", "crates/service/job/inference_job/config"] ).map_err(|err| { // NB: Fail open. warn!("Could not load app-specific secrets from env file (this might be fine, eg. provided by k8s): {:?}", err); diff --git a/crates/service/web/storyteller_web/storyteller-web.env b/crates/service/web/storyteller_web/config/storyteller-web.env similarity index 100% rename from crates/service/web/storyteller_web/storyteller-web.env rename to crates/service/web/storyteller_web/config/storyteller-web.env diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index 85ef72abef..e8eb41a95a 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -117,7 +117,7 @@ async fn main() -> AnyhowResult<()> { let _ = envvar::read_from_filename_and_paths( "storyteller-web.env", - &[".", "crates/service/web/storyteller_web"])?; + &[".", "./config", "crates/service/web/storyteller_web/config"])?; let common_env = CommonEnv::read_from_env()?;