From 016f66103638448df17dde9f796daefa83385bb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Jun 2022 01:28:00 +0000 Subject: [PATCH 1/4] Bump ossf/scorecard-action from 1.0.1 to 1.1.1 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 1.0.1 to 1.1.1. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/e3e75cf2ffbf9364bbff86cdbdf52b23176fe492...3e15ea8318eee9b333819ec77a36aca8d39df13e) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard-analysis.yml b/.github/workflows/scorecard-analysis.yml index 712d062..b7a8c36 100644 --- a/.github/workflows/scorecard-analysis.yml +++ b/.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 From c4a96e5d4319d9221b1638bb75f4851f1da23498 Mon Sep 17 00:00:00 2001 From: Varun Sharma Date: Sat, 11 Jun 2022 09:11:36 -0700 Subject: [PATCH 2/4] Create release-monitor.yml --- release-monitor.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 release-monitor.yml diff --git a/release-monitor.yml b/release-monitor.yml new file mode 100644 index 0000000..d55e4b9 --- /dev/null +++ b/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.10 + pipeline: + github-action: + repo: step-security/agent + workflow: release.yml + branches: + - main + tags: + - v* From d96542f0e777498b670921bb08a7a21c079b0c33 Mon Sep 17 00:00:00 2001 From: Varun Sharma Date: Sat, 11 Jun 2022 09:22:46 -0700 Subject: [PATCH 3/4] Update release-monitor.yml --- release-monitor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-monitor.yml b/release-monitor.yml index d55e4b9..6d46399 100644 --- a/release-monitor.yml +++ b/release-monitor.yml @@ -7,7 +7,7 @@ release-process: - 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.10 + go-version: 1.17.11 pipeline: github-action: repo: step-security/agent From 510aa679fa5dfccbf1fc90010171ea0a3ff10a2a Mon Sep 17 00:00:00 2001 From: h0x0er Date: Thu, 14 Jul 2022 10:50:50 +0530 Subject: [PATCH 4/4] reloading docker daemon instead of restarting --- dnsconfig.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dnsconfig.go b/dnsconfig.go index ecf6c51..2ed8a55 100644 --- a/dnsconfig.go +++ b/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