fix: unzip not waited before removing container

AtomiCloud · Nov 13, 2023 · 43a3ba6 · 43a3ba6
1 parent 389a5f2
commit 43a3ba6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/docker_executor/docker.go b/docker_executor/docker.go
@@ -22,6 +22,23 @@ type DockerClient struct {
 
 const networkName = "cyanprint"
 
+func (d *DockerClient) WaitContainer(ref DockerContainerReference) error {
+
+	name := DockerContainerToString(ref)
+
+	statusCh, errCh := d.Docker.ContainerWait(d.Context, name, container.WaitConditionNotRunning)
+	select {
+	case e := <-errCh:
+		if e != nil {
+			return e
+		}
+	case <-statusCh:
+	}
+
+	return nil
+
+}
+
 func (d *DockerClient) ListImages() ([]DockerImageReference, error) {
 
 	f := filters.NewArgs()

diff --git a/docker_executor/template_executor.go b/docker_executor/template_executor.go
@@ -179,13 +179,19 @@ func (de TemplateExecutor) startVolume(volRef DockerVolumeReference) error {
 
 	fmt.Println("🚧 Unzipping volume ", volRef.CyanId)
 	err = d.CreateContainerWithVolume(unzipContainer, volRef, unzipImage)
+	if err != nil {
+		fmt.Println("🚨 Failed to start unzip container", volRef.CyanId)
+		return err
+	} else {
+		fmt.Println("⚙️ Still unzipping...", volRef.CyanId)
+	}
+	err = d.WaitContainer(unzipContainer)
 	if err != nil {
 		fmt.Println("🚨 Failed to unzip volume", volRef.CyanId)
 		return err
 	} else {
 		fmt.Println("✅ Volume unzipped", volRef.CyanId)
 	}
-
 	fmt.Println("🧹 Removing unzip container", volRef.CyanId)
 	err = d.RemoveContainer(unzipContainer)
 	if err != nil {