Commit Graph

2850 Commits

Author SHA1 Message Date
Nathan LeClaire c120a925f3 Merge pull request #3373 from leonhartX/issue-3191
#3191 add zsh completion
2016-05-05 15:31:11 -07:00
Ke Xu 96a39d0397 add docs for zsh completion
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-05-03 11:03:12 +09:00
Ke Xu 8f4c947d42 grep text for per-driver options
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-04-30 11:17:01 +09:00
Nathan LeClaire ae9f392c10 Merge pull request #3365 from ndeloof/master
Fixes #2302 Possibility to create master with manager, but without agent
2016-04-28 12:12:51 -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
Nathan LeClaire 0a5abf22b6 Merge pull request #3393 from SvenDowideit/use-docs-base-oss
convert docs Dockerfiles to use docs/base:oss
2016-04-28 10:55:50 -07:00
Nathan LeClaire 25c3fa64a4 Merge pull request #3387 from ndeloof/fix-3287
Introduce —swarm-join-opt to pass options to agent nodes Fixes #3285 Fix regression introduced by PR #3287
2016-04-28 10:54:12 -07:00
Sven Dowideit fc7f35ab54 convert docs Dockerfiles to use docs/base:oss
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-04-28 12:57:23 +00: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
Nathan LeClaire 445158a731 Merge pull request #3378 from ahmetalpbalkan/azure-autorest-fix
azure: create temporary file next to destination
2016-04-27 14:56:20 -07:00
Ahmet Alp Balkan 0376230a5f
azure: create temporary file next to destination
We were doing atomic file writes by writing to /tmp
and moving to the actual destination, however some filesystems
do not support copying from /tmpfs.

Bumping the `go-autorest` dependency version to latest.

Fixes #3313.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-04-26 12:40:10 -07:00
Ke Xu 24103260a3 #3191 add zsh completion
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-04-26 11:51:40 +09:00
Nathan LeClaire af4f3828f6 Merge pull request #3370 from kacole2/documentation/add_rackhd_driver_plugin_to_list
Added RackHD to the Available Driver Plugin List & Alphabetized
2016-04-25 14:49:09 -07:00
Kendrick Coleman 58122bab64 Added RackHD to the Available Driver Plugin List & Alphabetized
Added RackHD to the list of available driver plugins. Also alphabetized the list to make it easier to read.

Signed-off-by: Kendrick Coleman <kendrickcoleman@gmail.com>
2016-04-25 16:58:13 -04:00
Nathan LeClaire 6839107ecc Merge pull request #3287 from LBaali/3285
Add support for --swarm-opt to agent nodes
2016-04-25 12:24:00 -07:00
Nathan LeClaire 4e898b1806 Merge pull request #3362 from nathanleclaire/fix_dangling_amazonec2_ssh_key
Ensure that attempt to remove instance and SSH key both go through
2016-04-25 11:48:35 -07:00
Nathan LeClaire 73bf92b95d Merge pull request #3360 from nathanleclaire/fix_driver_doc_404
Fix driver reference links
2016-04-22 15:12:05 -07:00
Nathan LeClaire 770d5bbb6f Ensure that attempt to remove instance and SSH key both go through
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-22 15:00:55 -07:00
Nathan LeClaire c9c6bc45f0 Fix driver reference links
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-22 11:43:15 -07:00
Nathan LeClaire 6abd00ae07 Merge pull request #3356 from nathanleclaire/go1.6.2_bump
Bump to Go 1.6.2
2016-04-22 11:17:44 -07:00
Nathan LeClaire 008283733e Merge pull request #3330 from bamarni/issue-3268
[Generic] Copy the public key to machine directory (fixes #3268)
2016-04-22 10:58:53 -07:00
Bilal Amarni 9f8f1330c7 [Generic] Copy the public key to machine directory
Keeping an "orphan" private key can have some drawbacks :

http://apple.stackexchange.com/questions/18458/password-dialog-appears-when-ssh-private-key-permissions-are-set-to-0600/26252#26252

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-22 10:11:57 +02:00
Nathan LeClaire d9d2f251db Bump to Go 1.6.2
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-21 16:54:19 -07:00
Nathan LeClaire ee17cf455f Merge pull request #3355 from nathanleclaire/bump_version_in_instal_doc
Bump version in install doc
2016-04-21 16:45:33 -07:00
Nathan LeClaire a3af149774 Bump version in install doc
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-21 16:16:14 -07:00
Nathan LeClaire 6204980e03 Merge pull request #3336 from ppadala/patch-1
[Doc] Updating instructions for adding dependencies
2016-04-21 11:04:06 -07:00
Nathan LeClaire ee48500fdc Merge pull request #3342 from bamarni/doc-generic-sshagent
[Generic] clarified doc / messages about ssh-agent
2016-04-21 11:03:34 -07:00
Nathan LeClaire a4b432b3a9 Merge pull request #3350 from xyziemba/master
Fix Default Address Space for Azure VNets
2016-04-21 11:02:39 -07:00
Nathan LeClaire a0f3d408d8 Merge pull request #3339 from ahmetalpbalkan/az-docs-fix
azure.md: typo fix
2016-04-20 18:49:19 -07:00
Nathan LeClaire 8770ea01f9 Merge pull request #3347 from exoscale/fix/exoscale-default-cloud-config
exoscale: fix cloud-init file to be compatible with CoreOS
2016-04-20 18:48:56 -07:00
Xavier Ziemba 10b2b9f3be Fix Default Address Space for Azure VNets
RFC 1918 specifies 10.0.0.0/8, not 10.0.0.0/6, as part of the private
network address space. This fixes what appears to be a typo.

Signed-off-by: Xavier Ziemba <xy.ziemba@gmail.com>
2016-04-20 16:11:15 -07:00
Vincent Bernat fc9c01f45a exoscale: fix cloud-init file to be compatible with CoreOS
The cloud-init implementation in CoreOS is quite limited and will choke
on `manage_etc_hosts: true`. Use `manage_etc_hosts: localhost` instead
which is supported. This is also supported by the classic Python
cloud-init implementation and the result is quite similar.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2016-04-20 21:23:08 +02:00
Nathan LeClaire da39c9fbbe Merge pull request #3338 from QuentinPerez/drivers
Add Scaleway Docker Machine Driver Plugin
2016-04-20 10:49:15 -07:00
Bilal Amarni 90cb223610 [Generic] clarified doc / messages about ssh-agent
As the IdentitiesOnly option is set with the SSH external client,
existing identities in ssh-agent won't be used unless it's the default
location.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-20 11:34:09 +02:00
Lucien Gougerot b0ef41f624 Closes #3285
This modification permits the swarm-agent created by docker-machine to
take into account the —swarm-opt arguments.

Signed-off-by: Lucien Gougerot <lucien.gougerot@gmail.com>
2016-04-20 11:16:39 +02:00
Ahmet Alp Balkan d1e65edad1 azure.md: typo fix
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-04-19 11:14:37 -07:00
Quentin Perez b3db3925d9
Add Scaleway Docker Machine Driver Plugin
Signed-off-by: Quentin Perez <qperez@ocs.online.net>
2016-04-19 14:41:29 +02:00
Pradeep Padala 53302b32b4 Updating instructions for adding dependencies
Instructions for adding a new dependency

Signed-off-by: Pradeep Padala <pradeep@containerx.io>
2016-04-18 17:51:11 -07:00
Nathan LeClaire cbb87491e1 Merge pull request #3328 from bamarni/issue-3306
SSH - don't enable BatchMode (fixes #3306)
2016-04-18 13:08:03 -07:00
Bilal Amarni b62afc85f7 SSH - don't enable BatchMode
When a passphrase protected key is not yet in ssh-agent, it gives a
chance to the user to fill a prompt instead of silently failing.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-17 09:39:52 +02:00
Nathan LeClaire 9718d6c266 Merge pull request #3312 from nathanleclaire/unbreak_upgrade
Remove lxc-docker to docker-engine migration code
2016-04-14 16:10:59 -07:00
Nathan LeClaire c4b848fb2a Merge pull request #3309 from nathanleclaire/changelog_b2drc
Add note about boot2docker RC getting behavior to changelog
2016-04-14 15:37:07 -07:00
Nathan LeClaire 9576b63077 Remove lxc-docker to docker-engine migration code
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-14 15:35:12 -07:00
Nathan LeClaire 28fcf3485e Add note about boot2docker RC getting behavior to changelog
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-14 14:23:42 -07:00
Nathan LeClaire 26cbaad949 Merge pull request #3278 from ezarko/1361
Oracle Enterprise Linux provisioner
2016-04-13 14:50:15 -07:00
Nathan LeClaire 4f7fed8263 Merge pull request #3302 from nathanleclaire/update_changelog
Revise changelog for 0.7.0
2016-04-13 13:58:44 -07:00
Nathan LeClaire a18eb89f79 Revise changelog for 0.7.0
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-13 11:56:53 -07:00
Nathan LeClaire a650a404fc Bump version to 0.7.0
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-13 11:39:36 -07:00
Nathan LeClaire 6b0b02fa83 Merge pull request #3301 from nathanleclaire/bump_go_1.6.1
Bump to Golang 1.6.1
2016-04-13 11:30:15 -07:00
Nathan LeClaire 4de87fd7fa Bump to Golang 1.6.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-13 11:12:57 -07:00