Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker for Machine: update #6364

Merged
merged 4 commits into from
Apr 3, 2018
Merged

Docker for Machine: update #6364

merged 4 commits into from
Apr 3, 2018

Conversation

akimd
Copy link
Contributor

@akimd akimd commented Apr 3, 2018

Proposed changes

Various fixes, see the commit messages.

akimd added 3 commits April 3, 2018 09:14
- shell does not have to be ugly
  - use variable to shorten long line
  - a line ending with && does not need a \
  - backquote are the past, use $(...)

- don't write text body within shell blocks

- don't propose to rm first docker-machine and then to use it

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
- migration from toolbox to D4M was removed
- shorten the text
- remove some hideous mistakes such as "you need to now how to",
  that git blames on me...

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
@akimd
Copy link
Contributor Author

akimd commented Apr 3, 2018

@gtardif For the records.

Copy link
Contributor

@gbarr01 gbarr01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM


* Docker for Mac application does not use `docker-machine` to provision
the Hyperkit-based VM it uses. The Docker Engine API is exposed on a
* Docker for Mac does not use `docker-machine` to provision its V.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

V or VM?

@gbarr01 gbarr01 merged commit 529960d into docker:master Apr 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants