Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

dev_container: Resume configured Compose services together (#60780)

Jonathan DEKHTIARad6773d433e0
diff --git a/crates/dev_container/src/devcontainer_manifest.rs b/crates/dev_container/src/devcontainer_manifest.rs
index 1f2b2373819..3392e01da59 100644
--- a/crates/dev_container/src/devcontainer_manifest.rs
+++ b/crates/dev_container/src/devcontainer_manifest.rs
@@ -36,6 +36,11 @@ enum ConfigStatus {
VariableParsed(DevContainer),
}
+enum ComposeUpBehavior {
+ Resume,
+ Create,
+}
+
#[derive(Debug, Clone, Eq, PartialEq, Default)]
pub(crate) struct DockerComposeResources {
files: Vec<PathBuf>,
@@ -1800,13 +1805,34 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
&self,
resources: DockerComposeResources,
) -> Result<DockerInspect, DevContainerError> {
+ self.start_docker_compose_services(&resources, ComposeUpBehavior::Create)
+ .await?;
+
+ if let Some(docker_ps) = self.check_for_existing_container().await? {
+ log::debug!("Found newly created dev container");
+ return self.docker_client.inspect(&docker_ps.id).await;
+ }
+
+ log::error!("Could not find existing container after docker compose up");
+
+ Err(DevContainerError::DevContainerParseFailed)
+ }
+
+ async fn start_docker_compose_services(
+ &self,
+ resources: &DockerComposeResources,
+ behavior: ComposeUpBehavior,
+ ) -> Result<(), DevContainerError> {
let mut command = Command::new(self.docker_client.docker_cli());
let project_name = self.project_name().await?;
command.args(&["compose", "--project-name", &project_name]);
- for docker_compose_file in resources.files {
+ for docker_compose_file in &resources.files {
command.args(&["-f", &docker_compose_file.display().to_string()]);
}
command.args(&["up", "-d"]);
+ if matches!(behavior, ComposeUpBehavior::Resume) {
+ command.arg("--no-recreate");
+ }
if let Some(run_services) = self.dev_container().run_services.as_ref() {
command.args(run_services);
}
@@ -1828,14 +1854,7 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
));
}
- if let Some(docker_ps) = self.check_for_existing_container().await? {
- log::debug!("Found newly created dev container");
- return self.docker_client.inspect(&docker_ps.id).await;
- }
-
- log::error!("Could not find existing container after docker compose up");
-
- Err(DevContainerError::DevContainerParseFailed)
+ Ok(())
}
async fn run_docker_image(
@@ -2165,7 +2184,15 @@ RUN sed -i -E 's/((^|\s)PATH=)([^\$]*)$/\1\${PATH:-\3}/g' /etc/profile || true
if !docker_inspect.is_running() {
log::debug!("Container not running. Will attempt to start, and then proceed");
- self.docker_client.start_container(&docker_ps.id).await?;
+
+ match self.dev_container().build_type() {
+ DevContainerBuildType::DockerCompose => {
+ let resources = self.docker_compose_manifest().await?;
+ self.start_docker_compose_services(&resources, ComposeUpBehavior::Resume)
+ .await?
+ }
+ _ => self.docker_client.start_container(&docker_ps.id).await?,
+ }
}
let remote_user = get_remote_user_from_config(&docker_inspect, self)?;
@@ -2975,6 +3002,7 @@ mod test {
use fs::{FakeFs, Fs};
use gpui::{AppContext, TestAppContext};
use http_client::{AsyncBody, FakeHttpClient, HttpClient};
+ use indoc::indoc;
use project::{
ProjectEnvironment,
worktree_store::{WorktreeIdCounter, WorktreeStore},
@@ -4969,6 +4997,75 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
);
}
+ #[gpui::test]
+ async fn test_resumes_only_requested_compose_services_without_recreating(
+ cx: &mut TestAppContext,
+ ) {
+ let devcontainer_contents = r#"
+ {
+ "dockerComposeFile": "docker-compose.yml",
+ "service": "devcontainer",
+ "runServices": ["devcontainer", "db"],
+ "workspaceFolder": "/workspaces/project",
+ "updateRemoteUserUID": false
+ }
+ "#;
+ let (test_dependencies, mut devcontainer_manifest) =
+ init_default_devcontainer_manifest(cx, devcontainer_contents)
+ .await
+ .unwrap();
+
+ test_dependencies
+ .fs
+ .atomic_write(
+ PathBuf::from(TEST_PROJECT_PATH).join(".devcontainer/docker-compose.yml"),
+ indoc! {r#"
+ services:
+ app:
+ image: test_image:latest
+ devcontainer:
+ image: test_image:latest
+ db:
+ image: postgres:18.4
+ "# }
+ .to_string(),
+ )
+ .await
+ .unwrap();
+
+ devcontainer_manifest.parse_nonremote_vars().unwrap();
+
+ assert!(
+ devcontainer_manifest
+ .check_for_existing_devcontainer()
+ .await
+ .unwrap()
+ .is_some()
+ );
+
+ let command = test_dependencies
+ .command_runner
+ .commands_by_program("docker")
+ .into_iter()
+ .find(|command| {
+ command.args.first().map(String::as_str) == Some("compose")
+ && command.args.iter().any(|argument| argument == "up")
+ })
+ .expect("docker compose up command recorded");
+
+ assert!(
+ command.args.ends_with(&[
+ "up".to_string(),
+ "-d".to_string(),
+ "--no-recreate".to_string(),
+ "devcontainer".to_string(),
+ "db".to_string(),
+ ]),
+ "compose resume should target requested services without recreating them, got: {:?}",
+ command.args
+ );
+ }
+
#[cfg(not(target_os = "windows"))]
#[gpui::test]
async fn test_spawns_devcontainer_with_docker_compose_and_podman(cx: &mut TestAppContext) {