Add back runsvint dependency

weaveworks · Jan 14, 2020 · 256e7b4 · 256e7b4
1 parent 54a513c
commit 256e7b4
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ SCOPE_BACKEND_BUILD_UPTODATE=.scope_backend_build.uptodate
 SCOPE_VERSION=$(shell git rev-parse --short HEAD)
 GIT_REVISION=$(shell git rev-parse HEAD)
 WEAVENET_VERSION=2.1.3
-RUNSVINIT=vendor/runsvinit/runsvinit
+RUNSVINIT=vendor/github.com/peterbourgon/runsvinit/runsvinit
 CODECGEN_DIR=vendor/github.com/ugorji/go/codec/codecgen
 CODECGEN_EXE=$(CODECGEN_DIR)/bin/codecgen_$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
 CODECGEN_UID=0
@@ -74,7 +74,7 @@ $(CLOUD_AGENT_EXPORT): docker/Dockerfile.cloud-agent docker/$(SCOPE_EXE) docker/
 
 $(SCOPE_EXPORT): docker/Dockerfile.scope $(CLOUD_AGENT_EXPORT) docker/$(RUNSVINIT) docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh
 
-$(RUNSVINIT): vendor/runsvinit/*.go
+$(RUNSVINIT): vendor/github.com/peterbourgon/runsvinit/*.go
 
 $(SCOPE_EXE): $(shell find ./ -path ./vendor -prune -o -type f -name '*.go') prog/staticui/staticui.go prog/externalui/externalui.go $(CODECGEN_TARGETS)
 

diff --git a/go.mod b/go.mod
@@ -121,6 +121,7 @@ require (
 	github.com/performancecopilot/speed v3.0.1-0.20180614024626-d49dd9b77adc+incompatible // indirect
 	github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c // indirect
 	github.com/peterbourgon/diskv v2.0.2-0.20171120014656-2973218375c3+incompatible // indirect
+	github.com/peterbourgon/runsvinit v2.0.0+incompatible
 	github.com/philhofer/fwd v0.0.0-20160129035939-98c11a7a6ec8 // indirect
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v0.9.2

diff --git a/go.sum b/go.sum
@@ -239,6 +239,8 @@ github.com/performancecopilot/speed v3.0.1-0.20180614024626-d49dd9b77adc+incompa
 github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4=
 github.com/peterbourgon/diskv v2.0.2-0.20171120014656-2973218375c3+incompatible h1:vC4yEuGvpjMoHhoIU9DYQJBvtQ5e0efvMVxpEYCWHzw=
 github.com/peterbourgon/diskv v2.0.2-0.20171120014656-2973218375c3+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/peterbourgon/runsvinit v2.0.0+incompatible h1:j6URJ2gUTfZbMBM1AnkJ7M82lQxawZm4LonASHXSu94=
+github.com/peterbourgon/runsvinit v2.0.0+incompatible/go.mod h1:cvlRM1j2aaGjcgVMMBX+uKbUFZkRL/2pA/RGE6Piv/M=
 github.com/philhofer/fwd v0.0.0-20160129035939-98c11a7a6ec8 h1:jkUFVqrKRttbdDqkTrvOmHxfqIsJK0Oe2WGi1ACAE+M=
 github.com/philhofer/fwd v0.0.0-20160129035939-98c11a7a6ec8/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/prog/main.go b/prog/main.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	_ "github.com/peterbourgon/runsvinit"
 	log "github.com/sirupsen/logrus"
 
 	billing "github.com/weaveworks/billing-client"

diff --git a/vendor/github.com/peterbourgon/runsvinit/.gitignore b/vendor/github.com/peterbourgon/runsvinit/.gitignore
diff --git a/vendor/github.com/peterbourgon/runsvinit/LICENSE b/vendor/github.com/peterbourgon/runsvinit/LICENSE
diff --git a/vendor/github.com/peterbourgon/runsvinit/README.md b/vendor/github.com/peterbourgon/runsvinit/README.md
diff --git a/vendor/github.com/peterbourgon/runsvinit/main.go b/vendor/github.com/peterbourgon/runsvinit/main.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -227,6 +227,8 @@ github.com/paypal/ionet
 github.com/pborman/uuid
 # github.com/peterbourgon/diskv v2.0.2-0.20171120014656-2973218375c3+incompatible
 github.com/peterbourgon/diskv
+# github.com/peterbourgon/runsvinit v2.0.0+incompatible
+github.com/peterbourgon/runsvinit
 # github.com/philhofer/fwd v0.0.0-20160129035939-98c11a7a6ec8
 github.com/philhofer/fwd
 # github.com/pkg/errors v0.8.1