Commit Graph

2671 Commits

Author SHA1 Message Date
Olivier Gambier 323fadd931 Merge pull request #2884 from hypriot/introduce-appveyor
Add appveyor.yml for native windows tests
2016-01-25 11:56:39 -08:00
Jean-Laurent de Morlhon 3255a90d0c Merge pull request #2912 from moxiegirl/new-navigation
New navigation for 1.10 Release
2016-01-25 18:04:50 +01:00
Mary Anthony 338a987699 New navigation for 1.10 Release
Removing unneeded processing script

Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-25 08:42:39 -08:00
David Gageot 9e83c68f1b Merge pull request #2917 from jeanlaurent/FIX-2860
Fix #2860
2016-01-25 16:41:50 +01:00
David Gageot 5d95524be6 Write CLI integration tests with Go
Signed-off-by: David Gageot <david@gageot.net>
2016-01-25 16:23:53 +01:00
Jean-Laurent de Morlhon 9de45af808 Fix #2860
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-25 16:17:44 +01:00
Stefan Scherer 8d928c7f20 Add appveyor.yml for native windows tests
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-25 16:13:27 +01:00
Jean-Laurent de Morlhon dd3b66e3b6 Merge pull request #2916 from dgageot/vbox-logs
Add more logs, specially for windows users
2016-01-25 15:52:15 +01:00
Jean-Laurent de Morlhon 01f4ffd21f Merge pull request #2752 from dgageot/google-reuse
Support creating a machine from an existing google VM
2016-01-25 15:39:51 +01:00
David Gageot a9cbd71d94 Merge pull request #2915 from jeanlaurent/fix-985
FIX #494 - Use same binary filename scheme as other docker-project
2016-01-25 15:36:42 +01:00
David Gageot b6b99747bf Add more logs, specially for windows users
Signed-off-by: David Gageot <david@gageot.net>
2016-01-25 15:02:30 +01:00
Jean-Laurent de Morlhon 9f63456a76 Update documentation and release note template
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-25 14:08:48 +01:00
Jean-Laurent de Morlhon ff18c1b7d0 Fix #494
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-25 14:08:42 +01:00
David Gageot 01bd88f6a5 Support creating a machine on an existing google VM
Signed-off-by: David Gageot <david@gageot.net>
2016-01-25 10:34:51 +01:00
Jean-Laurent de Morlhon e42734f2aa Merge pull request #2914 from cyphar/fix-dockerfile
Dockerfile: use COPY
2016-01-25 10:06:55 +01:00
David Gageot 8977d29bae Merge pull request #2902 from jeanlaurent/ls-single-line
Fix #2888 - Multi-line errors in ls mess with tab writing
2016-01-25 10:04:21 +01:00
Jean-Laurent de Morlhon 5b2c52c409 Fix #2888 - Multi-line errors in ls mess with tab writing
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-25 09:49:05 +01:00
Aleksa Sarai c2c561d804 Dockerfile: use COPY
ADD is far too magical, and we should be steering people away from it,
so using it in an official Docker project sends a mixed message.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-01-25 19:40:21 +11:00
Nathan LeClaire 6588968fb5 Merge pull request #2906 from patrikerdes/2905_swarm_active
Fix #2905, a Swarm host will now show as active by the active command when using the env --swarm option
2016-01-22 16:33:38 -08:00
Nathan LeClaire 432eece6ff Merge pull request #2904 from patrikerdes/2903_swarm_replication
Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
2016-01-22 14:52:26 -08:00
Nathan LeClaire 72d9c4d039 Merge pull request #2889 from dgageot/wait-host-only
Always wait for the host-only adapter to appear
2016-01-22 12:17:06 -08:00
Patrik Erdes 1a8ec8c722 Fix #2905, a Swarm host will now show as active by the active command when using the env --swarm option
Signed-off-by: Patrik Erdes <patrik@erdes.se>
2016-01-22 15:18:44 +01:00
Patrik Erdes 92b9853478 Fix #2903, revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
Signed-off-by: Patrik Erdes <patrik@erdes.se>
2016-01-22 14:51:59 +01:00
Jean-Laurent de Morlhon c341a289e1 Merge pull request #2900 from zchee/fix-typo-vb-misc
Fix typo
2016-01-22 09:32:55 +01:00
Koichi Shiraishi 9ea9399fa8
Fix typo
Signed-off-by: Koichi Shiraishi <k@zchee.io>
2016-01-22 14:13:24 +09:00
David Gageot 6ed2ab0e79 Always wait for the host-only adapter to appear
Signed-off-by: David Gageot <david@gageot.net>
2016-01-21 07:55:28 +01:00
Nathan LeClaire 474363d27a Merge pull request #2821 from hypriot/check-grand-parent-for-windows-shell
Detect shell from grand parent process name if not directly called from a windows shell
2016-01-20 15:55:23 -08:00
Nathan LeClaire 1449d69cde Merge pull request #2885 from exoscale/fix/doc-exoscale
docs: fix --exoscale-image description in documentation
2016-01-20 15:53:55 -08:00
Vincent Bernat 99870c2b5d docs: fix --exoscale-image description in documentation
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2016-01-20 14:41:34 +01:00
Jean-Laurent de Morlhon aeec7b716e Merge pull request #2881 from robbertkl/docs-fix-ips
Replace public IPs with reserved ones
2016-01-20 10:32:22 +01:00
Jean-Laurent de Morlhon 96a5d31e83 Merge pull request #2880 from robbertkl/docs-fix-default
Add other commands that support default machine
2016-01-20 10:30:55 +01:00
Robbert Klarenbeek cda5d00bd8 Replace public IPs with reserved ones
Signed-off-by: Robbert Klarenbeek <robbertkl@renbeek.nl>
2016-01-20 03:31:14 +01:00
Robbert Klarenbeek 106ce360a5 Add other commands that support default machine
Signed-off-by: Robbert Klarenbeek <robbertkl@renbeek.nl>
2016-01-20 03:13:03 +01:00
Stefan Scherer 3b4b168051 Check grand parent if not directly called from a windows shell
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-20 01:16:00 +01:00
Jean-Laurent de Morlhon 62bcc30859 Merge pull request #2874 from jeanlaurent/rm-infinite-loop
Fix infinite loop when deleting machine in ultra weird state
2016-01-19 16:55:55 +01:00
Jean-Laurent de Morlhon e466ee9479 Fix infinite loop when deleting machine in ultra weird state
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-19 16:29:29 +01:00
David Gageot 291533a671 Merge pull request #2872 from jeanlaurent/itbugsnag
Fix #2863 - write IT test for bugsnag
2016-01-19 16:16:35 +01:00
Jean-Laurent de Morlhon 872241e1ae Fix #2863 - write IT test for bugsnag
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-19 15:20:27 +01:00
Jean-Laurent de Morlhon b812fc9e2a Merge pull request #2869 from dgageot/fix-typo
vbm.go typo
2016-01-19 10:33:35 +01:00
Henrik Nyh 3b90a2a0a2 vbm.go typo
Signed-off-by: David Gageot <david@gageot.net>
2016-01-19 08:52:28 +01:00
David Gageot 81a13c4af9 Merge pull request #2864 from nathanleclaire/deprecate_minus_d
Update CoreOS provisioner to use 'docker daemon'
2016-01-19 08:51:16 +01:00
David Gageot 4bd97a106a Merge pull request #2865 from nathanleclaire/inspect_test
Add test for 'docker-machine inspect'
2016-01-19 08:50:26 +01:00
David Gageot 9603e2c2a3 Merge pull request #2868 from nathanleclaire/bump_dev_version_0.6.0-rc2
Bump version to 0.6.0-rc2-dev
2016-01-19 08:49:52 +01:00
David Gageot 3ba53a0869 Merge pull request #2867 from nathanleclaire/bump_changelog_0.6.0-rc1
Bump changelog for 0.6.0-rc1
2016-01-19 08:48:25 +01:00
Nathan LeClaire a494033da9 Bump version to 0.6.0-rc2-dev
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-18 16:02:20 -08:00
Nathan LeClaire 85cb395c3d Bump changelog for 0.6.0-rc1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-18 15:58:08 -08:00
Nathan LeClaire 174e390d5b Merge pull request #2866 from nathanleclaire/bump-0.6.0-rc1
Bump version to 0.6.0-rc1
2016-01-18 15:09:11 -08:00
Nathan LeClaire a845e1a45c Bump version to 0.6.0-rc1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-18 14:35:30 -08:00
Nathan LeClaire 8ea5300b5a Add test for 'docker-machine inspect'
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-18 14:30:11 -08:00
Nathan LeClaire ac0adbe7f8 Update CoreOS provisioner to use 'docker daemon'
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-18 14:28:42 -08:00