From 9507f102ccf81a47b95b0e273ef5bca1546d0183 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 27 Mar 2017 09:53:26 +0200 Subject: [PATCH] Rename .yaml to .yml docker-compose and other utilities use the .yml extension. For consistency rename all .yaml to .yml Signed-off-by: Rolf Neugebauer --- src/cmd/moby/build.go | 2 +- src/cmd/moby/main.go | 4 ++-- tools/infrakit.hyperkit/vendor/github.com/Masterminds/sprig | 1 - tools/infrakit.hyperkit/vendor/github.com/Sirupsen/logrus | 1 - tools/infrakit.hyperkit/vendor/github.com/aokoli/goutils | 1 - tools/infrakit.hyperkit/vendor/github.com/docker/infrakit | 1 - tools/infrakit.hyperkit/vendor/github.com/gorilla/context | 1 - tools/infrakit.hyperkit/vendor/github.com/gorilla/mux | 1 - tools/infrakit.hyperkit/vendor/github.com/gorilla/rpc | 1 - .../vendor/github.com/inconshreveable/mousetrap | 1 - .../infrakit.hyperkit/vendor/github.com/jmespath/go-jmespath | 1 - tools/infrakit.hyperkit/vendor/github.com/satori/go.uuid | 1 - tools/infrakit.hyperkit/vendor/github.com/spf13/cobra | 1 - tools/infrakit.hyperkit/vendor/github.com/spf13/pflag | 1 - 14 files changed, 3 insertions(+), 15 deletions(-) delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/Masterminds/sprig delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/Sirupsen/logrus delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/aokoli/goutils delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/docker/infrakit delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/gorilla/context delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/gorilla/mux delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/gorilla/rpc delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/inconshreveable/mousetrap delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/jmespath/go-jmespath delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/satori/go.uuid delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/spf13/cobra delete mode 160000 tools/infrakit.hyperkit/vendor/github.com/spf13/pflag diff --git a/src/cmd/moby/build.go b/src/cmd/moby/build.go index f84e6a5c4..5c81819d6 100644 --- a/src/cmd/moby/build.go +++ b/src/cmd/moby/build.go @@ -66,7 +66,7 @@ func containersInitrd(containers []*bytes.Buffer) (*bytes.Buffer, error) { } func build(name string, pull bool, args []string) { - conf := "moby.yaml" + conf := "moby.yml" if len(args) > 0 { conf = args[0] } diff --git a/src/cmd/moby/main.go b/src/cmd/moby/main.go index e0a99a1f3..a054edc2f 100644 --- a/src/cmd/moby/main.go +++ b/src/cmd/moby/main.go @@ -19,8 +19,8 @@ func main() { buildCmd := flag.NewFlagSet("build", flag.ExitOnError) buildCmd.Usage = func() { - fmt.Printf("USAGE: %s build [options] [file.yaml]\n\n", os.Args[0]) - fmt.Printf("'file.yaml' defaults to 'moby.yaml' if not specified.\n\n") + fmt.Printf("USAGE: %s build [options] [file.yml]\n\n", os.Args[0]) + fmt.Printf("'file.yml' defaults to 'moby.yml' if not specified.\n\n") fmt.Printf("Options:\n") buildCmd.PrintDefaults() } diff --git a/tools/infrakit.hyperkit/vendor/github.com/Masterminds/sprig b/tools/infrakit.hyperkit/vendor/github.com/Masterminds/sprig deleted file mode 160000 index 2d2df7bd8..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/Masterminds/sprig +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d2df7bd8bda53b5a55ed04422173cedd50500ea diff --git a/tools/infrakit.hyperkit/vendor/github.com/Sirupsen/logrus b/tools/infrakit.hyperkit/vendor/github.com/Sirupsen/logrus deleted file mode 160000 index 7f4b1adc7..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/Sirupsen/logrus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7f4b1adc791766938c29457bed0703fb9134421a diff --git a/tools/infrakit.hyperkit/vendor/github.com/aokoli/goutils b/tools/infrakit.hyperkit/vendor/github.com/aokoli/goutils deleted file mode 160000 index 9c37978a9..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/aokoli/goutils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9c37978a95bd5c709a15883b6242714ea6709e64 diff --git a/tools/infrakit.hyperkit/vendor/github.com/docker/infrakit b/tools/infrakit.hyperkit/vendor/github.com/docker/infrakit deleted file mode 160000 index 6516ace03..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/docker/infrakit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6516ace03d405955f738f8965abde5d9ab37fef6 diff --git a/tools/infrakit.hyperkit/vendor/github.com/gorilla/context b/tools/infrakit.hyperkit/vendor/github.com/gorilla/context deleted file mode 160000 index 08b5f424b..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/gorilla/context +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 diff --git a/tools/infrakit.hyperkit/vendor/github.com/gorilla/mux b/tools/infrakit.hyperkit/vendor/github.com/gorilla/mux deleted file mode 160000 index 999ef73f5..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/gorilla/mux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 999ef73f5d50979cf6d12afed1726325b63f9570 diff --git a/tools/infrakit.hyperkit/vendor/github.com/gorilla/rpc b/tools/infrakit.hyperkit/vendor/github.com/gorilla/rpc deleted file mode 160000 index 22c016f3d..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/gorilla/rpc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22c016f3df3febe0c1f6727598b6389507e03a18 diff --git a/tools/infrakit.hyperkit/vendor/github.com/inconshreveable/mousetrap b/tools/infrakit.hyperkit/vendor/github.com/inconshreveable/mousetrap deleted file mode 160000 index 76626ae9c..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/inconshreveable/mousetrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 diff --git a/tools/infrakit.hyperkit/vendor/github.com/jmespath/go-jmespath b/tools/infrakit.hyperkit/vendor/github.com/jmespath/go-jmespath deleted file mode 160000 index bd40a432e..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/jmespath/go-jmespath +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d diff --git a/tools/infrakit.hyperkit/vendor/github.com/satori/go.uuid b/tools/infrakit.hyperkit/vendor/github.com/satori/go.uuid deleted file mode 160000 index b061729af..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/satori/go.uuid +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b061729afc07e77a8aa4fad0a2fd840958f1942a diff --git a/tools/infrakit.hyperkit/vendor/github.com/spf13/cobra b/tools/infrakit.hyperkit/vendor/github.com/spf13/cobra deleted file mode 160000 index 92ea23a83..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/spf13/cobra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92ea23a837e66f46ac9e7d04fa826602b7b0a42d diff --git a/tools/infrakit.hyperkit/vendor/github.com/spf13/pflag b/tools/infrakit.hyperkit/vendor/github.com/spf13/pflag deleted file mode 160000 index 9ff6c6923..000000000 --- a/tools/infrakit.hyperkit/vendor/github.com/spf13/pflag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9ff6c6923cfffbcd502984b8e0c80539a94968b7