From 14b7e0fe5fa89bcddf654d5ad8f88c2fa755130d Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Thu, 22 Jan 2015 12:01:36 -0800 Subject: [PATCH] Add some misses I found Signed-off-by: Nathan LeClaire --- .dockerignore | 2 +- .gitignore | 2 +- ROADMAP.md | 4 ++-- script/build | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 20af222cd1..f6906185ff 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,2 @@ -machine* +docker-machine* .git diff --git a/.gitignore b/.gitignore index 288b62c015..5c68393170 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -machine* +docker-machine* diff --git a/ROADMAP.md b/ROADMAP.md index 9a0b65cafc..5bd1d761b2 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -19,6 +19,6 @@ There are two main areas for future development: - **Swarm integration:** Machine should be able to create and manage [Swarm](https://github.com/docker/swarm) clusters. Perhaps it's even the default. Imagine this: - $ machine create -d digitalocean production - $ machine scale production=100 + $ docker-machine create -d digitalocean production + $ docker-machine scale production=100 diff --git a/script/build b/script/build index 5b55677cf7..9425fa20e9 100755 --- a/script/build +++ b/script/build @@ -7,6 +7,6 @@ else OS_ARCH_ARG=($1) fi -rm -f machine_* +rm -f docker-machine* docker build -t docker-machine . exec docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine gox "${OS_ARCH_ARG[@]}" -output="docker-machine_{{.OS}}-{{.Arch}}"