diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile index 19e59e0da..af5b6ea59 100644 --- a/alpine/packages/diagnostics/Makefile +++ b/alpine/packages/diagnostics/Makefile @@ -3,7 +3,7 @@ all: diagnostics-server .PHONY: vendor vendor: mkdir -p ./vendor - cp -r ../go/vendor/* ./vendor/ + cp -r ../vendor/* ./vendor/ diagnostics-server: Dockerfile main.go vendor docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t diagnostics:build . diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile index 8211d14cb..cbe7494d9 100644 --- a/alpine/packages/proxy/Makefile +++ b/alpine/packages/proxy/Makefile @@ -3,10 +3,10 @@ all: proxy files: ls Dockerfile *.go > files find libproxy >> files - printf -- '-C\n../go\n' >> files - (cd ../go && find vendor) >> files + printf -- '-C\n..\n' >> files + (cd .. && find vendor) >> files -proxy: Dockerfile $(wildcard *.go libproxy/*.go) ../go/vendor/manifest files +proxy: Dockerfile $(wildcard *.go libproxy/*.go) ../vendor/manifest files tar cf - -T files | docker build -t proxy:build - docker run --rm proxy:build | tar xf - diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/.gitignore b/alpine/packages/vendor/github.com/Sirupsen/logrus/.gitignore similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/.gitignore rename to alpine/packages/vendor/github.com/Sirupsen/logrus/.gitignore diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/.travis.yml b/alpine/packages/vendor/github.com/Sirupsen/logrus/.travis.yml similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/.travis.yml rename to alpine/packages/vendor/github.com/Sirupsen/logrus/.travis.yml diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/CHANGELOG.md b/alpine/packages/vendor/github.com/Sirupsen/logrus/CHANGELOG.md similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/CHANGELOG.md rename to alpine/packages/vendor/github.com/Sirupsen/logrus/CHANGELOG.md diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/LICENSE b/alpine/packages/vendor/github.com/Sirupsen/logrus/LICENSE similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/LICENSE rename to alpine/packages/vendor/github.com/Sirupsen/logrus/LICENSE diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/README.md b/alpine/packages/vendor/github.com/Sirupsen/logrus/README.md similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/README.md rename to alpine/packages/vendor/github.com/Sirupsen/logrus/README.md diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/doc.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/doc.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/doc.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/doc.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/entry.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/entry.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/entry.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/entry.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/exported.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/exported.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/exported.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/exported.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatter.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/formatter.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatter.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/formatter.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/formatters/logstash/logstash.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/papertrail/README.md diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/sentry/README.md diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/sentry/sentry.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/json_formatter.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/json_formatter.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/json_formatter.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/json_formatter.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/logger.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/logger.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/logger.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/logger.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/logrus.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/logrus.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/logrus.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/logrus.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_bsd.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_bsd.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_bsd.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_bsd.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_linux.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_linux.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_linux.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_linux.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_windows.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_windows.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/terminal_windows.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/terminal_windows.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/text_formatter.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/text_formatter.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/text_formatter.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/text_formatter.go diff --git a/alpine/packages/go/vendor/github.com/Sirupsen/logrus/writer.go b/alpine/packages/vendor/github.com/Sirupsen/logrus/writer.go similarity index 100% rename from alpine/packages/go/vendor/github.com/Sirupsen/logrus/writer.go rename to alpine/packages/vendor/github.com/Sirupsen/logrus/writer.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/LICENSE b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/LICENSE similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/LICENSE rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/LICENSE diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/client.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/examples/client.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/client.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/examples/client.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgoecho.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/examples/hvgoecho.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgoecho.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/examples/hvgoecho.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgostress.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/examples/hvgostress.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/examples/hvgostress.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/examples/hvgostress.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_darwin.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_darwin.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_darwin.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_darwin.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_linux.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_linux.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_linux.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_linux.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_windows.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_windows.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_windows.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/hvsock_windows.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/zsyscall_windows.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/zsyscall_windows.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/hvsock/zsyscall_windows.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/hvsock/zsyscall_windows.go diff --git a/alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/vsock/vsock_linux.go b/alpine/packages/vendor/github.com/rneugeba/virtsock/go/vsock/vsock_linux.go similarity index 100% rename from alpine/packages/go/vendor/github.com/rneugeba/virtsock/go/vsock/vsock_linux.go rename to alpine/packages/vendor/github.com/rneugeba/virtsock/go/vsock/vsock_linux.go diff --git a/alpine/packages/go/vendor/manifest b/alpine/packages/vendor/manifest similarity index 100% rename from alpine/packages/go/vendor/manifest rename to alpine/packages/vendor/manifest diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile index 80f1e5578..1a40be85b 100644 --- a/alpine/packages/vsudd/Makefile +++ b/alpine/packages/vsudd/Makefile @@ -3,7 +3,7 @@ all: vsudd .PHONY: vendor vendor: mkdir -p ./vendor - cp -r ../go/vendor/* ./vendor/ + cp -r ../vendor/* ./vendor/ vsudd: Dockerfile main.go vendor docker build --build-arg GOOS=$(OS) --build-arg GOARCH=$(ARCH) -t vsudd:build .