diff --git a/Makefile b/Makefile index c35fab60d..52f0a3ef4 100644 --- a/Makefile +++ b/Makefile @@ -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 - touch $@ -moby-initrd.img: bin/moby moby.yaml - bin/moby build moby.yaml +moby-initrd.img: bin/moby moby.yml + bin/moby build moby.yml moby-bzImage: moby-initrd.img -test-initrd.img: bin/moby test/test.yaml - bin/moby build test/test.yaml +test-initrd.img: bin/moby test/test.yml + bin/moby build test/test.yml test-bzImage: test-initrd.img @@ -45,7 +45,7 @@ bin: mkdir -p $@ .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 define check_test_log diff --git a/README.md b/README.md index 0f5778451..2708a6920 100644 --- a/README.md +++ b/README.md @@ -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` 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 @@ -32,7 +32,7 @@ instead, and then use `moby build moby.yaml` to build the example configuration. ### Booting and Testing -If you have a recent version of Docker for Mac installed you can use `moby run ` to execute the image you created with `moby build .yaml` +If you have a recent version of Docker for Mac installed you can use `moby run ` to execute the image you created with `moby build .yml` The Makefile also specifies a number of targets: - `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 -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 platforms shortly. diff --git a/docs/gcp.md b/docs/gcp.md index 06e2dd8e5..f8734c26c 100644 --- a/docs/gcp.md +++ b/docs/gcp.md @@ -26,9 +26,9 @@ gcloud beta auth application-default login ## 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 specified bucket, and create a bootable image. diff --git a/examples/gcp.yaml b/examples/gcp.yml similarity index 100% rename from examples/gcp.yaml rename to examples/gcp.yml diff --git a/examples/sshd.yaml b/examples/sshd.yml similarity index 100% rename from examples/sshd.yaml rename to examples/sshd.yml diff --git a/examples/vmware.yaml b/examples/vmware.yml similarity index 100% rename from examples/vmware.yaml rename to examples/vmware.yml diff --git a/moby.yaml b/moby.yml similarity index 100% rename from moby.yaml rename to moby.yml diff --git a/projects/miragesdk/README.md b/projects/miragesdk/README.md index 556c037cf..3e9b61a7f 100644 --- a/projects/miragesdk/README.md +++ b/projects/miragesdk/README.md @@ -3,6 +3,6 @@ Instructions: ``` -../../bin/moby examples/mirage-dhcp.yaml` -../../scripts/qemu.sh mirage-dhcp-initrd.img mirage-dhcp-bzImage "$(bin/moby --cmdline mirage-dhcp.yaml)" +../../bin/moby examples/mirage-dhcp.yml` +../../scripts/qemu.sh mirage-dhcp-initrd.img mirage-dhcp-bzImage "$(bin/moby --cmdline mirage-dhcp.yml)" ``` diff --git a/projects/miragesdk/examples/mirage-dhcp.yaml b/projects/miragesdk/examples/mirage-dhcp.yml similarity index 100% rename from projects/miragesdk/examples/mirage-dhcp.yaml rename to projects/miragesdk/examples/mirage-dhcp.yml diff --git a/projects/selinux/Makefile b/projects/selinux/Makefile index 4809a1aa8..829c3316b 100644 --- a/projects/selinux/Makefile +++ b/projects/selinux/Makefile @@ -1,6 +1,6 @@ MOBY=../../bin/moby -selinux-initrd.img: $(MOBY) selinux.yaml +selinux-initrd.img: $(MOBY) selinux.yml $^ .PHONY: qemu diff --git a/projects/selinux/selinux.yaml b/projects/selinux/selinux.yml similarity index 100% rename from projects/selinux/selinux.yaml rename to projects/selinux/selinux.yml diff --git a/projects/wireguard/examples/wireguard.yaml b/projects/wireguard/examples/wireguard.yml similarity index 100% rename from projects/wireguard/examples/wireguard.yaml rename to projects/wireguard/examples/wireguard.yml diff --git a/projects/wireguard/roadmap.md b/projects/wireguard/roadmap.md index c10c616e4..5969422d1 100644 --- a/projects/wireguard/roadmap.md +++ b/projects/wireguard/roadmap.md @@ -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`. ## 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, WireGuard has a [network namespace integration](https://www.wireguard.io/netns/) that we could use for Moby's containers. @@ -46,4 +46,4 @@ WireGuard has a [network namespace integration](https://www.wireguard.io/netns/) This is a natural fit because WireGuard associates public keys to IP addresses: a docker-compose link would simply need a reference to a key in addition to the existing IP address info for this to work. However there are some open questions: - `containerd` does not intend to support networks from the roadmap - - `links` are not currently supported on swarm stack deploys at present \ No newline at end of file + - `links` are not currently supported on swarm stack deploys at present 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/test/ltp/test-ltp.yaml b/test/ltp/test-ltp.yml similarity index 100% rename from test/ltp/test-ltp.yaml rename to test/ltp/test-ltp.yml diff --git a/test/test.yaml b/test/test.yml similarity index 100% rename from test/test.yaml rename to test/test.yml diff --git a/test/virtsock/README.md b/test/virtsock/README.md index af925a32f..9b132f87d 100644 --- a/test/virtsock/README.md +++ b/test/virtsock/README.md @@ -1,5 +1,5 @@ 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). diff --git a/test/virtsock/test-virtsock-server.yaml b/test/virtsock/test-virtsock-server.yml similarity index 100% rename from test/virtsock/test-virtsock-server.yaml rename to test/virtsock/test-virtsock-server.yml