From d8d673bf2411ed1093f56078e42774b70dd777f9 Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Tue, 9 Jun 2015 17:13:09 -0700 Subject: [PATCH] Closes #1329 when merged Updating links Updating with the comments from the team Signed-off-by: Mary Anthony --- docs/index.md | 7 ++++++ experimental/README.md | 22 +++++++++++++++++++ {docs => experimental}/b2d_migration.md | 2 ++ {docs => experimental}/b2d_migration_tasks.md | 0 script/generate-coverage | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 experimental/README.md rename {docs => experimental}/b2d_migration.md (98%) rename {docs => experimental}/b2d_migration_tasks.md (100%) diff --git a/docs/index.md b/docs/index.md index 1b4208477d..af95f084a1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1456,6 +1456,13 @@ Create machines locally using [VirtualBox](https://www.virtualbox.org/). This driver requires VirtualBox to be installed on your host. $ docker-machine create --driver=virtualbox vbox-test + +You can create an entirely new machine or you can convert a Boot2Docker VM into +a machine by importing the VM. To convert a Boot2Docker VM, you'd use the following +command: + + $ docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm b2d + Options: diff --git a/experimental/README.md b/experimental/README.md new file mode 100644 index 0000000000..7df0e8c0e5 --- /dev/null +++ b/experimental/README.md @@ -0,0 +1,22 @@ +# Docker Machine Experimental Features + +Docker Machine’s experimental features gives you access to bleeding edge features. By identifying experimental features, you can try out features early and give feedback to the Docker Machine maintainers. In this way, we hope to refine our feature designs by exposing them earlier to real-world usage. + +This page describes the experimental features in Docker Machine. Docker Machine is currently in beta. Neither it nor its experimental features are ready for production use. + +The information below describes each feature and the Github pull requests and +issues associated with it. If necessary, links are provided to additional +documentation on an issue. As an active Docker user and community member, +please feel free to provide any feedback on these features you wish. + +## Current experimental features + +Currently, you can experiment with [migrating a Boot2Docker created VM to Docker Machine](b2d_migration.md). Also, consider reviewing our [rough plan for the migration](b2d_migration_tasks.md). + +Additional experimental features include support for Red Hat, Debian, CentOS, Fedora, and RancherOS as base OSes. These features have no separate feature documentation. We simply encourage you to try them. + +## How to comment on an experimental feature + +Each feature's documentation includes a list of proposal pull requests or PRs associated with the feature. If you want to comment on or suggest a change to a feature, please add it to the existing feature PR. + +Issues or problems with a feature? Inquire for help on the `#docker-machine` IRC channel or in on the [Docker Google group](https://groups.google.com/forum/#!forum/docker-user). \ No newline at end of file diff --git a/docs/b2d_migration.md b/experimental/b2d_migration.md similarity index 98% rename from docs/b2d_migration.md rename to experimental/b2d_migration.md index 2191509225..ad33b37884 100644 --- a/docs/b2d_migration.md +++ b/experimental/b2d_migration.md @@ -1,3 +1,5 @@ +# Migrate from Boot2Docker CLI to Docker Machine + This guide explains migrating from the Boot2Docker CLI to Docker Machine. This guide assumes basic knowledge of the Boot2Docker CLI and Docker Machine. If you are not familiar, please review those docs prior to migrating. diff --git a/docs/b2d_migration_tasks.md b/experimental/b2d_migration_tasks.md similarity index 100% rename from docs/b2d_migration_tasks.md rename to experimental/b2d_migration_tasks.md diff --git a/script/generate-coverage b/script/generate-coverage index cd7173d494..ec79666413 100755 --- a/script/generate-coverage +++ b/script/generate-coverage @@ -41,7 +41,7 @@ fi # Script will bomb out on some dirs if there are no buildable source files, # we shouldn't be checking these anyway so skip over them. -EXCLUDED_DIRS="${DIR}/Godeps ${DIR}/test ${DIR}/docs ${DIR}/script" +EXCLUDED_DIRS="${DIR}/Godeps ${DIR}/test ${DIR}/docs ${DIR}/script ${DIR}/experimental" generate_coverage_for_dir ${DIR} echo "Done checking and generating coverage!"