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 <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-03-27 09:53:26 +02:00
parent 88286c6868
commit e9fbe43b34
19 changed files with 19 additions and 19 deletions

View File

@ -23,13 +23,13 @@ bin/infrakit-instance-hyperkit: $(INFRAKIT_DEPS) | bin
tar cf - vendor -C src/cmd/infrakit-instance-hyperkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby -o $@ | tar xf - tar cf - vendor -C src/cmd/infrakit-instance-hyperkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/docker/moby -o $@ | tar xf -
touch $@ touch $@
moby-initrd.img: bin/moby moby.yaml moby-initrd.img: bin/moby moby.yml
bin/moby build moby.yaml bin/moby build moby.yml
moby-bzImage: moby-initrd.img moby-bzImage: moby-initrd.img
test-initrd.img: bin/moby test/test.yaml test-initrd.img: bin/moby test/test.yml
bin/moby build test/test.yaml bin/moby build test/test.yml
test-bzImage: test-initrd.img test-bzImage: test-initrd.img
@ -45,7 +45,7 @@ bin:
mkdir -p $@ mkdir -p $@
.PHONY: hyperkit .PHONY: hyperkit
hyperkit: bin/moby moby-initrd.img moby-bzImage moby.yaml hyperkit: bin/moby moby-initrd.img moby-bzImage moby.yml
bin/moby run moby bin/moby run moby
define check_test_log define check_test_log

View File

@ -22,7 +22,7 @@ This will build the Moby customisation tool and a Moby initrd image.
If you already have a Go build environment and installed the source in your `GOPATH` If you already have a Go build environment and installed the source in your `GOPATH`
you can do `go install github.com/docker/moby/cmd/moby` to install the `moby` tool you can do `go install github.com/docker/moby/cmd/moby` to install the `moby` tool
instead, and then use `moby build moby.yaml` to build the example configuration. instead, and then use `moby build moby.yml` to build the example configuration.
#### Build requirements #### Build requirements
@ -32,7 +32,7 @@ instead, and then use `moby build moby.yaml` to build the example configuration.
### Booting and Testing ### Booting and Testing
If you have a recent version of Docker for Mac installed you can use `moby run <name>` to execute the image you created with `moby build <name>.yaml` If you have a recent version of Docker for Mac installed you can use `moby run <name>` to execute the image you created with `moby build <name>.yml`
The Makefile also specifies a number of targets: The Makefile also specifies a number of targets:
- `make qemu` will boot up a sample Moby in qemu in a container - `make qemu` will boot up a sample Moby in qemu in a container
@ -43,7 +43,7 @@ The Makefile also specifies a number of targets:
## Customise ## Customise
To customise, copy or modify the [`moby.yaml`](moby.yaml) to your own `file.yaml` or use on of the [examples](examples/) and then run `./bin/moby build file.yaml` to To customise, copy or modify the [`moby.yml`](moby.yml) to your own `file.yml` or use on of the [examples](examples/) and then run `./bin/moby build file.yml` to
generate its specified output. You can run the output with `./scripts/qemu.sh` or on OSX with `./bin/moby run file`. `moby run` targets will be available for other generate its specified output. You can run the output with `./scripts/qemu.sh` or on OSX with `./bin/moby run file`. `moby run` targets will be available for other
platforms shortly. platforms shortly.

View File

@ -26,9 +26,9 @@ gcloud beta auth application-default login
## Build a moby image ## Build a moby image
Add a `gcp` output line to your yaml config, see the example in `examples/gcp.yaml`. Add a `gcp` output line to your yaml config, see the example in `examples/gcp.yml`.
Then do `./bin/moby myfile.yaml` Then do `./bin/moby myfile.yml`
This will create a local `myfile.img.tar.gz` compressed image file, upload it to the This will create a local `myfile.img.tar.gz` compressed image file, upload it to the
specified bucket, and create a bootable image. specified bucket, and create a bootable image.

View File

View File

@ -3,6 +3,6 @@
Instructions: Instructions:
``` ```
../../bin/moby examples/mirage-dhcp.yaml` ../../bin/moby examples/mirage-dhcp.yml`
../../scripts/qemu.sh mirage-dhcp-initrd.img mirage-dhcp-bzImage "$(bin/moby --cmdline mirage-dhcp.yaml)" ../../scripts/qemu.sh mirage-dhcp-initrd.img mirage-dhcp-bzImage "$(bin/moby --cmdline mirage-dhcp.yml)"
``` ```

View File

@ -1,6 +1,6 @@
MOBY=../../bin/moby MOBY=../../bin/moby
selinux-initrd.img: $(MOBY) selinux.yaml selinux-initrd.img: $(MOBY) selinux.yml
$^ $^
.PHONY: qemu .PHONY: qemu

View File

@ -25,7 +25,7 @@ This project embeds the `wireguard-tools` package in the userspace image.
This is built into the `mobylinux/init-wireguard` image that is generated by `cd init-wireguard && make`. This is built into the `mobylinux/init-wireguard` image that is generated by `cd init-wireguard && make`.
## Quickstart ## Quickstart
The quickest way to get started is to use the provided `examples/wireguard.yaml` in this directory and use the prebuilt images. The quickest way to get started is to use the provided `examples/wireguard.yml` in this directory and use the prebuilt images.
To give WireGuard a spin, the [official quick start](https://www.wireguard.io/quickstart/) is a good way to get going. For containers, To give WireGuard a spin, the [official quick start](https://www.wireguard.io/quickstart/) is a good way to get going. For containers,
WireGuard has a [network namespace integration](https://www.wireguard.io/netns/) that we could use for Moby's containers. WireGuard has a [network namespace integration](https://www.wireguard.io/netns/) that we could use for Moby's containers.

View File

@ -66,7 +66,7 @@ func containersInitrd(containers []*bytes.Buffer) (*bytes.Buffer, error) {
} }
func build(name string, pull bool, args []string) { func build(name string, pull bool, args []string) {
conf := "moby.yaml" conf := "moby.yml"
if len(args) > 0 { if len(args) > 0 {
conf = args[0] conf = args[0]
} }

View File

@ -19,8 +19,8 @@ func main() {
buildCmd := flag.NewFlagSet("build", flag.ExitOnError) buildCmd := flag.NewFlagSet("build", flag.ExitOnError)
buildCmd.Usage = func() { buildCmd.Usage = func() {
fmt.Printf("USAGE: %s build [options] [file.yaml]\n\n", os.Args[0]) fmt.Printf("USAGE: %s build [options] [file.yml]\n\n", os.Args[0])
fmt.Printf("'file.yaml' defaults to 'moby.yaml' if not specified.\n\n") fmt.Printf("'file.yml' defaults to 'moby.yml' if not specified.\n\n")
fmt.Printf("Options:\n") fmt.Printf("Options:\n")
buildCmd.PrintDefaults() buildCmd.PrintDefaults()
} }

View File

@ -1,5 +1,5 @@
This directory contains the files to build and run a container containing the This directory contains the files to build and run a container containing the
virtio and Hyper-V socket stress tests. `test-virtsock-server.yaml` builds images which start the server inside the VM. virtio and Hyper-V socket stress tests. `test-virtsock-server.yml` builds images which start the server inside the VM.
The client, to be run on the host as per this [README](https://github.com/rneugeba/virtsock/blob/master/examples/README.md), can be obtained compiled from [here](https://github.com/rneugeba/virtsock). The client, to be run on the host as per this [README](https://github.com/rneugeba/virtsock/blob/master/examples/README.md), can be obtained compiled from [here](https://github.com/rneugeba/virtsock).