diff --git a/CHANGELOG.md b/CHANGELOG.md index df7dbaf75..9445c2296 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ By far most changes relate to `atomic-server`, so if not specified, assume the c **Changes to JS assets (including the front-end and JS libraries) are not shown here**, but in [`/browser/CHANGELOG`](/browser/CHANGELOG.md). See [STATUS.md](server/STATUS.md) to learn more about which features will remain stable. +## UNRELEASED + +- Use `musl` + `alpine` builds for docker images, way smaller images #620 +- Support multi-platform docker builds #731 +- Remove deprecated ENV vars #732 + ## [v0.36.1] - 2023-12-06 - Fix locally searching for atomicdata.dev resources in external servers #706 diff --git a/server/src/config.rs b/server/src/config.rs index df6af8f05..3c9b40b61 100644 --- a/server/src/config.rs +++ b/server/src/config.rs @@ -230,7 +230,7 @@ pub fn build_config(opts: Opts) -> AtomicServerResult { } else { atomic_lib::config::default_config_dir_path()? }; - let mut config_file_path = config_dir.join("config.toml"); + let config_file_path = config_dir.join("config.toml"); let mut https_path = config_dir.clone(); https_path.push("https"); @@ -248,28 +248,6 @@ pub fn build_config(opts: Opts) -> AtomicServerResult { let mut search_index_path = cache_dir.to_owned(); search_index_path.push("search_index"); - for (key, value) in env::vars() { - match &*key { - "ATOMIC_CONFIG_FILE_PATH" => { - config_file_path = value.parse().map_err(|e| { - format!( - "Could not parse ATOMIC_CONFIG_FILE_PATH. Is {} a valid path? {}", - value, e - ) - })?; - } - "ATOMIC_STORE_PATH" => { - store_path = value.parse().map_err(|e| { - format!( - "Could not parse ATOMIC_STORE_PATH. Is {} a valid path? {}", - value, e - ) - })?; - } - _ => {} - } - } - let initialize = !std::path::Path::exists(&store_path) || opts.initialize; if opts.https & opts.email.is_none() {