Merge pull request #266 from h0x0er/docker-reload

Reload docker daemon instead of restart

.github/workflows/scorecard-analysis.yml

@@ -24,7 +24,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e3e75cf2ffbf9364bbff86cdbdf52b23176fe492 # v1.0.1
+        uses: ossf/scorecard-action@3e15ea8318eee9b333819ec77a36aca8d39df13e # v1.0.1
         with:
           results_file: results.sarif
           results_format: sarif

dnsconfig.go

@@ -166,12 +166,12 @@ func (d *DnsConfig) SetDockerDNSServer(cmd Command, configPath, tempDir string)
 	}
 
 	if cmd == nil {
-		cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl restart docker")
+		cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl reload docker")
 	}
 
 	err = cmd.Run()
 	if err != nil {
-		return fmt.Errorf(fmt.Sprintf("error re-starting docker: %v", err))
+		return fmt.Errorf(fmt.Sprintf("error reloading docker: %v", err))
 	}
 
 	return nil
@@ -186,12 +186,12 @@ func (d *DnsConfig) RevertDockerDNSServer(cmd Command, configPath string) error
 		}
 
 		if cmd == nil {
-			cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl restart docker")
+			cmd = exec.Command("/bin/sh", "-c", "sudo systemctl daemon-reload && sudo systemctl reload docker")
 		}
 
 		err = cmd.Run()
 		if err != nil {
-			return fmt.Errorf(fmt.Sprintf("error re-starting docker: %v", err))
+			return fmt.Errorf(fmt.Sprintf("error reloading docker: %v", err))
 		}
 	}
 	return nil

release-monitor.yml

@@ -0,0 +1,18 @@
+name: "step-security/agent release"
+release-process:
+  artifact-location:
+    github-release:
+      repo: step-security/agent
+  reproducible-build:
+    - artifact: agent_{{.Version}}_linux_amd64.tar.gz
+      binary: agent
+      build-command: go build -trimpath -ldflags="-s -w -X main.version={{.Version}} -X main.commit={{.FullCommit}} -X main.date=123"
+      go-version: 1.17.11      
+  pipeline:
+    github-action:
+      repo: step-security/agent
+      workflow: release.yml
+    branches: 
+      - main      
+    tags:
+      - v*