Roman Coedo
f81870e4f1
Global set for fish env
...
Using "set -x" only exports the variable in the local scope.
This is a limitation when an user needs to invoke "docker-machine" in a fish script.
Using "set -gx" instead exports the variable globally.
Signed-off-by: Roman Coedo <romancoedo@gmail.com>
2015-11-18 21:35:32 +01:00
David Gageot
f0740fe8ad
FIX #2190 no need killing docker-machine processes
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 18:16:01 +01:00
David Gageot
93f94d9521
Fix an integration test
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 18:16:01 +01:00
David Gageot
36cf498fb2
Use a different machine name for each time
...
This makes ITs more isolated and more robust
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 18:16:01 +01:00
David Gageot
65d04ea6c7
Fix test because the error was changed
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 18:16:01 +01:00
David Gageot
a9741f1090
build before ITs
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 18:16:01 +01:00
David Gageot
06fc443626
Merge pull request #2338 from dgageot/rollback-provisionner
...
Revert "Remove systemd-related driver duplication"
2015-11-18 18:09:05 +01:00
David Gageot
b00e30c38f
Revert "Remove systemd-related driver duplication"
...
This reverts commit fda08f5e15
.
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 17:36:40 +01:00
David Gageot
ffbcd35993
Merge pull request #2336 from dgageot/better-logs
...
Plugin's stdout shouldn't show `OUT`
2015-11-18 17:03:34 +01:00
David Gageot
6de1fd13d3
Plugin's stdout shouldn't show `OUT`
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 16:45:58 +01:00
Jean-Laurent de Morlhon
cee5c0ce15
Merge pull request #2334 from yamamoto-febc/change_driversmd
...
Update AVAILABLE_DRIVER_PLUGINS.md
2015-11-18 15:36:20 +01:00
Kazumichi Yamamoto
97fadf48b0
Update AVAILABLE_DRIVER_PLUGINS.md
...
Signed-off-by: Kazumichi Yamamoto <yamamoto.febc@gmail.com>
2015-11-18 23:21:46 +09:00
David Gageot
1c43b5e106
Merge pull request #2329 from SvenDowideit/reduce-docs-validation-errors
...
fix docs validation errors
2015-11-18 15:20:23 +01:00
Jean-Laurent de Morlhon
96f519b36f
Copy once b2d iso prior to testing
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-18 14:20:02 +01:00
Evan Hazlett
acebb0bd09
Merge pull request #2333 from dmp42/16-maintainer
...
Adding Jean-Laurent to the team
2015-11-18 13:15:09 +01:00
Olivier Gambier
e252b32841
Adding Jean-Laurent to the team
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-18 13:08:19 +01:00
David Gageot
cda0c5c2d6
Merge pull request #2331 from jeanlaurent/it-fresh-start
...
IT: cleanup properly before starting
2015-11-18 12:42:34 +01:00
Sven Dowideit
cab3af3960
Add hugo frontmatter to docs that should not be published, and fix a link
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-18 21:08:36 +10:00
Sven Dowideit
4c414a719a
fix link which when published leads to the root of all the docs.docker.com site
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-18 21:01:55 +10:00
Jean-Laurent de Morlhon
f2fe553280
IT: cleanup properly before starting
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-18 11:49:28 +01:00
David Gageot
ad5fd0f976
Merge pull request #2319 from benhamill/fix_bash_completion
...
Dashes not allowed in Bash identifiers.
2015-11-18 10:52:49 +01:00
David Gageot
88c48196ef
Merge pull request #2326 from nathanleclaire/systemd_remove_duplication
...
Remove systemd-related driver duplication
2015-11-18 10:46:35 +01:00
David Gageot
eb42133a06
Merge pull request #2122 from chantra/mount_linux
...
Add shared folder and virtualization check for Linux.
2015-11-18 10:12:56 +01:00
David Gageot
fa24554871
Merge pull request #2290 from dgageot/quality-03-simpler-test
...
Quality 03 simpler test
2015-11-18 09:40:25 +01:00
David Gageot
0c296783be
Merge pull request #2289 from dgageot/quality-02-move-code
...
Quality 02 move code
2015-11-18 09:40:01 +01:00
David Gageot
a618a029cf
Merge pull request #2327 from nathanleclaire/netstat_add_flga
...
Add -n to get port number for netstat
2015-11-18 09:27:10 +01:00
David Gageot
f3025e6d17
Merge pull request #2328 from nathanleclaire/add_driversmd
...
Update some driver/plugin-related documentation
2015-11-18 09:25:36 +01:00
David Gageot
41dd8c5878
Merge pull request #2281 from narqo/fix-dirvers-geturl
...
More accurate way to calculate drivers' urls with IPv6 support
2015-11-18 09:23:11 +01:00
David Gageot
d8da062f73
Merge pull request #2245 from jeanlaurent/2204-make-fail-with-https
...
Fix for #2244 - make fails with https remote url
2015-11-18 09:21:58 +01:00
Nathan LeClaire
fda08f5e15
Remove systemd-related driver duplication
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-17 19:47:10 -08:00
Nathan LeClaire
736e485782
Update some driver/plugin-related documentation
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-17 19:00:34 -08:00
Nathan LeClaire
1bdedc6ea2
Add -n to get port number for netstat
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-17 18:24:44 -08:00
Nathan LeClaire
a0b75d1645
Merge pull request #2214 from nathanleclaire/delete_bridge
...
Delete bridge after powering daemon down
2015-11-17 16:56:35 -08:00
Nathan LeClaire
96404cba4e
Merge pull request #2306 from ngauthier/fix-host-nil-swarm-options
...
skip printing swarm info when host options swarm info is nil
2015-11-17 16:40:51 -08:00
Nathan LeClaire
8d19826c38
Merge pull request #2311 from trecloux/1891-support_ubuntu_15.04_and_higher
...
Introduce support for ubuntu 15.04 and higher
2015-11-17 14:49:59 -08:00
Ben Hamill
5707b38a9e
Replace - with _ in bash completion identifiers.
...
Signed-off-by: Ben Hamill <git-commits@benhamill.com>
2015-11-17 15:20:29 -06:00
Thomas Recloux
4457dce51d
Introduce support for ubuntu 15.04 and higher
...
Starting with version 15.04, ubuntu is based on systemd. The existing
ubuntu provider did not support systemd.
This commit introduce a new provider dedicated to systemd based
versions.
The previous provider is renamed to ubuntu_upstart.
Provider detection uses the /etc/os=release VERSION_ID.
Version ID is converted to a float value and then used to choose between
providers.
Unit tests are validating the provisioner compatibility.
Fixes #1891
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com>
2015-11-17 11:21:41 +01:00
Nathan LeClaire
537f89e775
Merge pull request #2315 from nathanleclaire/changelog
...
Update CHANGELOG.md
2015-11-16 18:38:43 -08:00
Nathan LeClaire
405d2179c1
Merge pull request #2309 from nathanleclaire/bump_0.5.1-dev
...
Bump 0.5.2 dev
2015-11-16 18:38:27 -08:00
Nathan LeClaire
746b3cc9b6
Bump version to 0.5.2-dev
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-16 16:55:19 -08:00
Nathan LeClaire
d9946fdc6b
Update CHANGELOG.md
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-16 16:45:49 -08:00
Nathan LeClaire
7e8e38e148
Merge pull request #2308 from nathanleclaire/bump_0.5.1
...
Bump version to 0.5.1
2015-11-16 11:12:17 -08:00
Nathan LeClaire
7e8949a8ea
Bump version to 0.5.1
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-16 10:23:02 -08:00
Nick Gauthier
a34a394810
skip printing swarm info when host options swarm info is nil
...
Fixes #2252 #2280
Signed-off-by: Nick Gauthier <ngauthier@gmail.com>
2015-11-16 15:54:16 +01:00
Olivier Gambier
15fecaec59
Merge pull request #2301 from skatsuta/doc-inactive-hyphen
...
docs: show "-" for "inactive" machines
2015-11-16 09:13:14 +01:00
Olivier Gambier
717965784d
Merge pull request #2297 from yamamoto-febc/fix_call_godep
...
Change godep command call to use the GODEP variable
2015-11-16 09:12:06 +01:00
Soshi Katsuta
4a5e8efc59
docs: show "-" for "inactive" machines
...
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
2015-11-16 15:21:10 +09:00
Kazumichi Yamamoto
3363a49ffc
Change godep command call to use the GODEP variable
...
Signed-off-by: Kazumichi Yamamoto <yamamoto.febc@gmail.com>
2015-11-14 15:54:31 +09:00
Nathan LeClaire
d8d57b845d
Merge pull request #2288 from dgageot/quality-01-unused-code
...
Quality01 - Remove unused code
2015-11-13 10:11:33 -08:00
David Gageot
a8e3ee868f
Simpler test code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-13 16:27:50 +01:00