docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
2,209 Commits 92 Branches 28 Tags
cdfa729f366b73ea91aecd8f07fdf1288cff498a
Commit Graph

2209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Gageot
cdfa729f36 Simplify code 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-22 12:04:46 +01:00
David Gageot
181a1d47b4 The generic driver shouldn't support kill since stop is not supported 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-22 11:46:59 +01:00
David Gageot
4bfd8ab4c1 Remove dead code in generic driver 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-22 11:46:14 +01:00
Jean-Laurent de Morlhon
acf2d1da4c Merge pull request #2652 from kaustavha/kaustavha/fix/Makefile 
fix(Makefile): Prevent makefile from using containers when $USE_CONTAINERS=false
 2015-12-22 09:57:17 +01:00
Jean-Laurent de Morlhon
5ee9dfdc94 Merge pull request #2649 from dgageot/2540-honor-engine-install-url 
FIX #2540 provisioners honor engine-install-url
 2015-12-22 09:53:40 +01:00
Jean-Laurent de Morlhon
f2ca6b8bd0 Merge pull request #2651 from synhaptein/patch-1 
Update aws.md
 2015-12-22 09:49:24 +01:00
kaustav haldar
302044858b fix(Makefile): Prevent makefile from defaulting to using containers if use_containers=false 
Signed-off-by: kaustav haldar <hi@kaustav.me>
 2015-12-21 17:30:30 -08:00
Philippe L'Heureux
f6a67ef9c2 Update aws.md 
--amazonec2-use-private-address wasn't documented

Signed-off-by: Philippe L'Heureux <philippe@ejenio.com>
 2015-12-21 15:08:29 -05:00
Jean-Laurent de Morlhon
01873fe22d Merge pull request #2638 from schlosna/bugfix/bash-wrapper 
Fix bash docker-machine wrapper
 2015-12-21 17:24:29 +01:00
Jean-Laurent de Morlhon
ed12b42ca0 Merge pull request #2646 from dgageot/2643-scp-without-ssh-key 
FIX #2643 Ignore empty ssh key
 2015-12-21 17:16:22 +01:00
Jean-Laurent de Morlhon
6e8aaa0d56 Merge pull request #2645 from dgageot/2370-add-feedback 
FIX #2370 add feedback to the user
 2015-12-21 17:08:07 +01:00
Jean-Laurent de Morlhon
cd6690ccd5 Merge pull request #2647 from dgageot/windows-version 
Try multiple commands to find windows version
 2015-12-21 17:06:00 +01:00
Jean-Laurent de Morlhon
1815d0bb16 Merge pull request #2648 from dgageot/2641-do-custom-ssh-port 
FIX #2641 Digital Ocean Custom SSH port
 2015-12-21 17:01:24 +01:00
David Gageot
7b638738cc Try multiple commands to find windows version 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-21 16:19:01 +01:00
David Gageot
6f8a6dd272 FIX #2641 Digital Ocean Custom SSH port 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-21 16:16:33 +01:00
David Gageot
280f9c6cc6 FIX #2540 provisioners honor engine-install-url 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-21 15:07:43 +01:00
David Gageot
d977ec73af FIX #2643 Ignore empty ssh key 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-21 12:55:29 +01:00
David Gageot
34b6468c2c FIX #2370 add feedback to the user 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-21 12:04:01 +01:00
David Gageot
df30a135b2 Merge pull request #2644 from dgageot/nathanleclaire-xtra_vbox_logs 
Add extra logging to VirtualBox driver
 2015-12-21 09:46:31 +01:00
David Gageot
c584b8e641 Merge pull request #2625 from dgageot/2624-reject-duplicate-hostonlyifs 
FIX #2624 reject duplicate hostonlyifs name/IP
 2015-12-21 09:29:25 +01:00
Nathan LeClaire
54bda622d3 Add extra logging to VirtualBox driver 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-12-21 09:20:53 +01:00
David Gageot
352d28220c Merge pull request #2620 from dgageot/2619-hardware-virtualization-test 
Don't create the VM if no hardware virtualization
 2015-12-21 09:18:49 +01:00
David Gageot
3c4fd63f93 FIX #2624 reject duplicate hostonlyifs name/IP 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-21 09:15:01 +01:00
David Gageot
906ac38d5a Merge pull request #2607 from askb/2595-dm-force-fails 
Fixes #2595 remove fails when config.json is not found
 2015-12-21 09:06:48 +01:00
David Gageot
34a6231837 Merge pull request #2633 from nathanleclaire/ssh_client_log 
Log SSH client used
 2015-12-21 09:05:50 +01:00
David Gageot
3b84a94a84 Merge pull request #2636 from nathanleclaire/increase_heartbeat_intervals 
Increase heartbeat interval and timeout
 2015-12-21 09:04:23 +01:00
David Schlosnagle
464e19ba1c Delegate to docker-machine from wrapper 
Fix an issue with the bash __docker-machine-wrapper function where
commands other than `use` would result in an error.

Signed-off-by: David Schlosnagle <schlosna@gmail.com>
 2015-12-19 04:29:46 -05:00
Anil Belur
403b57437f Fixes #2595 dm rm fails when config.json is not found 
This issue occurs when `api.Load()` fails while loading
the `config.json` file, in case the config file is not present.
Refactored the code to handled `-y` and `-f` as documented.
Now added UT for remove options.

Signed-off-by: Anil Belur <askb23@gmail.com>
 2015-12-19 12:01:41 +05:30
Nathan LeClaire
98ca59394a Increase heartbeat interval and timeout 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-12-18 18:53:01 -08:00
Nathan LeClaire
e143ef730c Log SSH client used 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-12-18 17:26:26 -08:00
Nathan LeClaire
204af9fe5e Merge pull request #2618 from dgageot/2189-update-b2d-cache-in-precreatecheck 
Update b2d cache in PreCreateCheck
 2015-12-18 16:51:56 -08:00
Nathan LeClaire
ecfe9a18bf Merge pull request #2627 from dgageot/2626-windows-version-non-english 
FIX #2626 Retrieve windows version on non-english OS
 2015-12-18 16:16:41 -08:00
Nathan LeClaire
932c4a2d27 Merge pull request #2629 from dgageot/2617-check-hostonlyif-after-its-creation 
FIX #2617 Check hostonlyif after its creation
 2015-12-18 16:15:26 -08:00
Nathan LeClaire
df8faf56cb Merge pull request #2609 from jeanlaurent/vbox.log 
Add vbox.log to crashreport
 2015-12-18 14:09:18 -08:00
David Gageot
dd379d33c8 FIX #2617 Check hostonlyif after its creation 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-18 17:44:52 +01:00
David Gageot
39694f1ab4 FIX #2626 Retrieve windows version on non-english OS 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-18 16:28:46 +01:00
David Gageot
ac45f88ce3 Don't create the VM if no hardware virtualization 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-18 12:27:04 +01:00
Jean-Laurent de Morlhon
fbf97b7c73 Merge pull request #2610 from jeanlaurent/detect-shell 
Enhance shell detection in `env` command
 2015-12-18 12:19:46 +01:00
Jean-Laurent de Morlhon
fd25762c05 Add vbox.log to crashreport 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-12-18 12:17:32 +01:00
Jean-Laurent de Morlhon
c279d0aba2 Default to cmd shell on windows 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-12-18 11:42:11 +01:00
David Gageot
a7bd9e06d2 Update B2D cache in PreCreateCheck phase 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-18 11:14:59 +01:00
David Gageot
0a74068b11 Merge pull request #2298 from skatsuta/create-update-iso 
Upgrade the boot2docker.iso cache if possible when creating a VirtualBox machine
 2015-12-18 08:39:22 +01:00
Jean-Laurent de Morlhon
80c9f5bbd9 Merge pull request #2605 from askb/update_bash_comp 
update the bash completion with new options added.
 2015-12-17 17:46:58 +01:00
Jean-Laurent de Morlhon
c07067c7e4 Detect fish shell 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-12-17 16:43:59 +01:00
Anil Belur
dcdbd84452 Updated the bash completion with new options added. 
now changes should reflect the following:
dm ls --timeout
dm env --no-proxy
dm --bugsnag-api-token --github-api-token

Signed-off-by: Anil Belur <askb23@gmail.com>
 2015-12-17 10:20:22 +05:30
Nathan LeClaire
32795c9d1f Merge pull request #2604 from nathanleclaire/bump_v0.5.5_dev 
Bump version to 0.5.5-dev
 2015-12-16 15:45:54 -08:00
Nathan LeClaire
552967fc00 Bump version to 0.5.5-dev 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-12-16 15:38:09 -08:00
Nathan LeClaire
6643d0e53e Merge pull request #2603 from nathanleclaire/bump_version_0.5.4 
Bump version to 0.5.4
 2015-12-16 15:23:27 -08:00
Nathan LeClaire
403fe4a98a Bump version to 0.5.4 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-12-16 14:20:32 -08:00
Nathan LeClaire
5b5163812c Merge pull request #2599 from jeanlaurent/extract-recording 
Remove Logrus follow-up
 2015-12-16 13:33:01 -08:00