diff --git a/docs/security-guide/cvm-boundaries.md b/docs/security-guide/cvm-boundaries.md index 3eeb29ed..b15c844c 100644 --- a/docs/security-guide/cvm-boundaries.md +++ b/docs/security-guide/cvm-boundaries.md @@ -29,7 +29,7 @@ This is the main configuration file for the application in JSON format: | name | 0.3.1 | string | Name of the instance | | runner | 0.3.1 | string | Name of the runner (currently defaults to "docker-compose") | | docker_compose_file | 0.3.1 | string | YAML string representing docker-compose config | -| docker_config | 0.3.1 | object | Additional docker settings (currently empty) | +| docker_config | 0.3.1 | object | (Removed since 0.5.5) Additional docker settings (currently empty) | | kms_enabled | 0.3.1 | boolean | Enable/disable KMS | | gateway_enabled | 0.3.1 | boolean | Enable/disable gateway | | local_key_provider_enabled | 0.3.1 | boolean | Use a local key provider | diff --git a/dstack-types/src/lib.rs b/dstack-types/src/lib.rs index dd7ed1db..1188a1f0 100644 --- a/dstack-types/src/lib.rs +++ b/dstack-types/src/lib.rs @@ -17,8 +17,6 @@ pub struct AppCompose { #[serde(default)] pub docker_compose_file: Option, #[serde(default)] - pub docker_config: DockerConfig, - #[serde(default)] pub public_logs: bool, #[serde(default)] pub public_sysinfo: bool, diff --git a/dstack-util/src/system_setup.rs b/dstack-util/src/system_setup.rs index d9207752..697f18b2 100644 --- a/dstack-util/src/system_setup.rs +++ b/dstack-util/src/system_setup.rs @@ -1137,7 +1137,6 @@ impl Stage1<'_> { .notify_q("boot.progress", "setting up docker") .await; self.setup_docker_registry()?; - self.setup_docker_account(&envs)?; Ok(()) } @@ -1172,20 +1171,10 @@ impl Stage1<'_> { info!("Setting up docker registry"); let registry_url = self .shared - .app_compose - .docker_config - .registry + .sys_config + .docker_registry .as_deref() .unwrap_or_default(); - let registry_url = if registry_url.is_empty() { - self.shared - .sys_config - .docker_registry - .as_deref() - .unwrap_or_default() - } else { - registry_url - }; if registry_url.is_empty() { return Ok(()); } @@ -1205,38 +1194,6 @@ impl Stage1<'_> { fs::write(DAEMON_ENV_FILE, serde_json::to_string(&daemon_env)?)?; Ok(()) } - - fn setup_docker_account(&self, envs: &BTreeMap) -> Result<()> { - info!("Setting up docker account"); - let username = self - .shared - .app_compose - .docker_config - .username - .as_deref() - .unwrap_or_default(); - if username.is_empty() { - return Ok(()); - } - let token_key = self - .shared - .app_compose - .docker_config - .token_key - .as_deref() - .unwrap_or_default(); - if token_key.is_empty() { - return Ok(()); - } - let token = envs - .get(token_key) - .with_context(|| format!("Missing token for {username}"))?; - if token.is_empty() { - bail!("Missing token for {username}"); - } - cmd!(docker login -u $username -p $token)?; - Ok(()) - } } macro_rules! const_pad {