Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,463 Commits 1 Branch 72 Tags
master
Commit Graph

268 Commits

Author SHA1 Message Date
Paulo Matos
ead1588fc6 Add emacs as option to env command --shell flag 
Signed-off-by: Paulo Matos <pmatos@linki.tools>
 2018-04-12 14:59:58 +02:00
Joffrey F
7c1c8d749b Add --client-certs flag to regeneratecerts command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-20 12:09:47 -08:00
Joffrey F
7055c0238b Fix argument escaping for scp on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-09 16:10:13 -08:00
Anders F Björklund
ff1474832f Add progress output to rsync transfer 
Closes #4318

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
 2017-12-21 22:22:24 +01:00
Anders F Björklund
4df3951f37 Add quiet parameter to the scp command 
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
 2017-12-21 22:13:49 +01:00
Herberts Markuns
b1c7a3c134 Replaced string insertion with quoted string insertion in string formatting of IdentityFile path. 
Signed-off-by: Herberts Markuns <herbis33@gmail.com>
 2017-10-04 11:51:35 -07:00
Herberts Markuns
c8407e9815 Added quotes around IdentityFile path, to avoid a fatal error when a space character is present at the path. 
Signed-off-by: Herberts Markuns <herbis33@gmail.com>
 2017-10-04 11:51:35 -07:00
Anders F Björklund
eb6af9c740 Add mount command for mounting machine directories 
This comes in handy, when wanting to use volumes with drivers that
don't support folder sharing (such as KVM, as opposed to VirtualBox)

You will need FUSE and SSHFS installed, in order to use this feature.
The machine will also need a "sftp" binary, but most of them have it.

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
 2017-10-03 14:19:59 -07:00
Joffrey F
47068ae585 Update non-existent rm test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-02 19:14:56 -07:00
Konstantin Gribov
5c31d05906 Fix misleading create command description 
Signed-off-by: Konstantin Gribov <grossws@gmail.com>
 2017-08-10 10:28:51 -07:00
Dmitry Ilyevsky
09d6720dd8 Allow setting optional [user@] for scp command. 
Argument is now of form: [[user@]host:]file

Signed-off-by: Dmitry Ilyevsky <ilyevsky@gmail.com>
 2017-06-12 02:24:51 -07:00
Anders F Björklund
a462fc30e0 Add delta option to the scp command, using rsync 
When doing repeated syncs, or copying large directories, it is more
efficient to use "rsync" than to use "scp". Both use "ssh" to do it.

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
 2017-03-10 07:17:52 +01:00
Nathan LeClaire
69d4b95b2b Make virtualbox default driver 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-02-21 14:03:09 -08:00
Nathan LeClaire
b98be6edaa Merge pull request #3973 from assaflavie/master 
Return error, not just log it, when failing to get the status of a
 2017-02-10 10:50:15 -08:00
Aaron.L.Xu
bfd2546447 fix typos in project scope 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-10 13:40:04 +08:00
Helen-xie
6e8f8b9dc7 Eliminate fmt.Sprintf 
Signed-off-by: Helen-xie <xieyulin821@harmonycloud.cn>
 2017-02-07 15:43:17 +08:00
Assaf Lavie
8af8d50ca7 Return error, not just log it, when failing to get the status of a 
machine with a missing driver.

Signed-off-by: Assaf Lavie <a@assaflavie.com>
 2017-01-29 09:02:00 +02:00
Nathan LeClaire
3f20d202a2 Revert "Add DOCKER_API_VERSION to env" 
This reverts commit cc6c432ad8.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-01-17 13:47:23 -08:00
Nathan LeClaire
d8884192a2 Fix 'docker-machine config' cert paths 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-12-07 14:19:20 -08:00
Nathan LeClaire
1a878477dd Merge pull request #3873 from nathanleclaire/fix_scp_host 
Fix improper use of IP in generateLocationArg
 2016-11-15 17:42:27 -08:00
Nathan LeClaire
59d3beb201 Fix improper use of IP in generateLocationArg 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 17:35:34 -08:00
Nathan LeClaire
19973f2b1b Fix golint errors 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 17:14:17 -08:00
KOBAYASHI Shinji
cc6c432ad8 Add DOCKER_API_VERSION to env 
Fixes #2046

Signed-off-by: KOBAYASHI Shinji <koba@jp.fujitsu.com>
 2016-10-24 09:57:42 +09:00
Joffrey F
985b007802 On Windows, add the COMPOSE_CONVERT_WINDOWS_PATHS environment variable 
to the ouput of the env command.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-19 17:57:19 -07:00
Tao Wang
5ce0ab2d12 Add SSH port support for scp command. Fix #3492 
Fix #3492
Signed-off-by: Tao Wang <twang2218@gmail.com>
 2016-08-30 08:21:01 +10:00
Bilal Amarni
9e003791c1 [scp] allow ssh-agent when no key is provided 
Fixes #3663

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
 2016-08-19 12:37:47 +02:00
Han Zhang
f1789ea84a Add specified warnings in rm option 
Closes  https://github.com/docker/machine/issues/3640

Signed-off-by: Han Zhang <han@zhanghan177.me>
 2016-08-04 09:49:28 -07:00
Eric Bloch
96c904a51e Add tcsh support to --shell 
Fixes #3404

Signed-off-by: Eric Bloch <eric.bloch@gmail.com>
 2016-05-04 20:29:07 -07:00
Nicolas De Loof
8ed715fd4f Fixes #2302 Possibility to create master with manager, but without agent 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2016-04-28 20:16:56 +02:00
Nicolas De Loof
ab1ca913ad Introduce —swarm-join-opt to pass options to agent nodes 
Fixes #3285
Fix regression introduced by PR #3287

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2016-04-28 09:40:31 +02:00
John Sirois
5f802ce66c Add a test for create command flag handling. 
This complements the fix in 705865fa by adding a test for unset flags
with defaults as well as other combinations of set and unset flags.

Signed-off-by: John Sirois <john.sirois@gmail.com>
 2016-03-30 11:31:56 -06:00
John Sirois
705865fa70 Fixup create command flag application. 
Previously StringSlice flag defaults were not respected.  These use
special handling and that handling did not take account of default
values, always over-writing them.  Expand the CommandLine interface to
take advantage of the underlying codegansta/cli.Context IsSet method and
guard default string slice overwrites with an IsSet test.

Signed-off-by: John Sirois <john.sirois@gmail.com>
 2016-03-29 11:53:22 -06:00
Andre Caron
b85531506a Silences docker-machine env command on Windows. 
Signed-off-by: Andre Caron <andre.l.caron@gmail.com>
 2016-03-25 09:03:53 -04:00
David Gageot
fa986949e0 Merge pull request #3120 from daehyeok/Driver_env 
DRIVER environment variable
 2016-03-04 07:29:26 +01:00
Daehyeok Mun
aa461f079d DRIVER environment variable 
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
 2016-03-02 17:44:15 -07:00
David Gageot
e3ff59bd92 Export flags for consumers of libmachine 
Signed-off-by: David Gageot <david@gageot.net>
 2016-03-02 22:27:59 +01:00
Patrik Erdes
e7c58ea7ae Fix #3015 
Signed-off-by: Patrik Erdes <patrik@erdes.se>
 2016-02-18 12:28:22 +01:00
Jean-Laurent de Morlhon
1eaf5a464f Merge pull request #3020 from mssola/swarm-experimental 
Added a flag to enable experimental Swarm features
 2016-02-13 14:10:44 -08:00
Miquel Sabaté Solà
7e201c4005 Added a flag to enable experimental Swarm features 
The `create` command now has the `--swarm-experimental` boolean flag, that
tells the Swarm provisioner to enable experimental features in Swarm.

Fixes #2861

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
 2016-02-13 12:21:20 +01:00
David Gageot
7a6ca308c4 FIX #3016 Add timeout to active command 
Signed-off-by: David Gageot <david@gageot.net>
 2016-02-11 13:55:52 -08:00
David Gageot
8345672b18 FIX #3040 Slow test 
Signed-off-by: David Gageot <david@gageot.net>
 2016-02-11 13:31:36 -08:00
David Kirk
090c575c0d Add env var support. 
Signed-off-by: David Kirk <davemkirk@gmail.com>
 2016-02-10 21:25:28 -06:00
David Gageot
834b9b4161 FIX #2982 Fix auto detection 
Signed-off-by: David Gageot <david@gageot.net>
 2016-02-03 08:23:12 -08:00
Nathan LeClaire
d27ccb0f6e Exit with code 3 if error is during pre-create check 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-02-02 16:08:57 -08:00
Nathan LeClaire
0118532393 Reset default shell for env to bash 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-01-28 12:11:22 -08:00
David Gageot
b6be1b79bc Merge pull request #2954 from jeanlaurent/engine-url 
Fix #2029 - local drivers dont run with engine-install-url
 2016-01-28 18:26:01 +01:00
Jean-Laurent de Morlhon
8eb22b411b Fix #2029 - local drivers dont run with engine-install-url 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2016-01-28 18:05:58 +01:00
David Gageot
794cf4cf4d Make go vet ./... happy 
Signed-off-by: David Gageot <david@gageot.net>
 2016-01-28 11:15:12 +01:00
Carlos Derich
0a1eb5d79f fix ls command with wrong header values 
fixes #2937

Signed-off-by: Carlos Derich <d.erich@hotmail.com>
 2016-01-27 01:10:55 -03:00
Nathan LeClaire
e9294b4fcf Add RESPONSE time to available columns in ls 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>

Signed-off-by: David Gageot <david@gageot.net>
 2016-01-26 11:34:14 +01:00