Merge pull request #278 from step-security/int

Fix live-restore issue

dnsconfig.go

@@ -46,6 +46,7 @@ func updateDockerConfig(configPath string) error {
 	}
 
 	m["dns"] = []string{dockerDnsServer}
+	m["live-restore"] = true
 
 	config, err := json.Marshal(m)
 	if err != nil {
@@ -162,21 +163,31 @@ func (d *DnsConfig) SetDockerDNSServer(cmd Command, configPath, tempDir string)
 	if err != nil {
 		return fmt.Errorf(fmt.Sprintf("error backing up docker config: %v", err))
 	}
-
+	mock := cmd != nil
 	err = updateDockerConfig(configPath)
 	if err != nil {
 		return fmt.Errorf(fmt.Sprintf("error updating to docker daemon config: %v", err))
 	}
 
-	if cmd == nil {
-		cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl reload docker")
+	// reload will apply the live-restore config so running containers restart after docker is restarted
+	if !mock {
+		cmd = exec.Command("/bin/sh", "-c", "sudo systemctl reload docker")
 	}
 
 	err = cmd.Run()
 	if err != nil {
 		return fmt.Errorf(fmt.Sprintf("error reloading docker: %v", err))
 	}
 
+	if !mock {
+		cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl restart docker")
+	}
+
+	err = cmd.Run()
+	if err != nil {
+		return fmt.Errorf(fmt.Sprintf("error restarting docker: %v", err))
+	}
+
 	return nil
 }
 

dnsconfig_test.go

@@ -41,11 +41,11 @@ func Test_updateDockerConfig(t *testing.T) {
 	}{
 		{name: "existing file",
 			args:    args{configPath: tmpFileName},
-			want:    "{\"cgroup-parent\":\"/actions_job\",\"dns\":[\"172.17.0.1\"]}",
+			want:    "{\"cgroup-parent\":\"/actions_job\",\"dns\":[\"172.17.0.1\"],\"live-restore\":true}",
 			wantErr: false},
 		{name: "non existent file",
 			args:    args{configPath: mockDockerConfigPath},
-			want:    "{\"dns\":[\"172.17.0.1\"]}",
+			want:    "{\"dns\":[\"172.17.0.1\"],\"live-restore\":true}",
 			wantErr: false},
 	}