Commit Graph

3292 Commits

Author SHA1 Message Date
Joffrey F
97c1136d1e Remedy updated linter errors
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-02 13:44:36 -07:00
Marc-Aurèle Brothier
ec49d3697c driver exoscale: move location to follow go tools standards
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2017-10-02 12:49:27 -07:00
Marc-Aurèle Brothier
a653508d7e driver exoscale: move egoscale lib from pyr to exoscale org
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2017-10-02 12:49:27 -07:00
fate-grand-order
6edf9f6d90 fix some typos to make Go Report more happy
Signed-off-by: Helen <chenjg@harmonycloud.cn>
2017-08-10 10:30:27 -07:00
Marc-Aurèle Brothier
7236beaadd driver: update exoscale driver
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2017-08-10 10:29:31 -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
Christian Bundy
2ec02eca31 Upgrade Google driver image to most recent version
This resolves #4207, which is caused by dpkg being locked in the previous image.

Signed-off-by: Christian Bundy <christianbundy@fraction.io>
2017-08-10 10:27:54 -07:00
Evan Hazlett
d5ab995ac3 remove ehazlett from maintainers
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-08-10 10:26:01 -07:00
Joffrey F
7cadeac5ff Merge pull request #4150 from otiai10/4149-fix-test-scenario-adjusting-to-latest-spec
Fix test scenario to adjust to latest spec
2017-07-17 15:01:58 -07:00
Joffrey F
a6e6a3b4e4 Merge pull request #4140 from SvenDowideit/support-multiple-networks
[VSPHERE] Support multiple networks
2017-07-13 15:00:21 -07:00
Joffrey F
67f6430f5f Merge pull request #4167 from andrestc/amazonec2-userdata-error
drivers/amazonec2: logs userdata file error
2017-07-13 14:59:43 -07:00
Joffrey F
f524cdc151 Merge pull request #4194 from shin-/4137-vmware
Fix vsphere / vmwarefusion provisioning
2017-07-12 16:34:36 -07:00
Joffrey F
a18f251a6b Merge pull request #4193 from shin-/4191-update-ec2-amis
Update EC2 AMIs to newest versions. This should fix AUFS support
2017-07-12 16:29:08 -07:00
polawat phetra
628f4c256a Fix vsphere / vmwarefusion provisioning
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-12 16:23:33 -07:00
Joffrey F
c21aa11042 Update EC2 AMIs to newest versions. This should fix AUFS support
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-12 16:17:02 -07:00
Joffrey F
2cff5fdf9d Merge pull request #4132 from cambridgeconsultants/vsphere-fix-using-drs-cluster
driver/vmwarevsphere: Fix issue #2893 creating VMs using DRS cluster
2017-07-11 12:30:15 -07:00
Joffrey F
08e7a5fd53 Merge pull request #4141 from Empact/extglob
Don't use extglob in bash/docker-machine.bash
2017-07-11 12:29:07 -07:00
Joffrey F
fcfbd11c80 Merge pull request #4174 from andrestc/hostkeycallback
ssh: Adds HostKeyCallback
2017-07-10 16:16:10 -07:00
Joffrey F
ce676b940b Merge pull request #4143 from SvenDowideit/add-vsphere-cfgparams
[VSPHERE] Add vm config params
2017-07-10 16:07:56 -07:00
Joffrey F
e65117bf96 Merge pull request #4145 from exoscale/update-exoscale-driver
Update egoscale driver version
2017-07-07 15:05:44 -07:00
Joffrey F
5c663c79de Merge pull request #4185 from SvenDowideit/rancheros-skip-default-docker-install-script
Skip the default docker provisioning script, RancherOS already has a docker installed
2017-07-07 14:59:18 -07:00
Joffrey F
72471680b6 Merge pull request #4187 from shin-/LordMike-patch-1
Reorder if's to ensure that err is not null before using it.
2017-07-07 14:55:06 -07:00
Joffrey F
e044dfdbe9 gofmt fix
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-07 14:39:18 -07:00
Michael Bisbjerg
0fb360f39e Reorder if's to ensure that err is not null before using it.
A bug seems to have been introduced that used `err` even though it might be null at the time. See issue #4146.

Signed-off-by: Michael Bisbjerg <michael@mbwarez.dk>
2017-07-07 14:39:18 -07:00
Joffrey F
58e0303642 Merge pull request #4130 from dilyevsky/scp-set-user
Allow setting optional [user@] for scp command.
2017-07-07 14:01:23 -07:00
Sven Dowideit
52b61aa017 Skip the default docker provisioning script, RancherOS already has a docker installed
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-07-07 16:00:55 +10:00
André Carvalho
b63e1e8b2c ssh: adds HostKeyCallback to native client config
Signed-off-by: André Carvalho <asantostc@gmail.com>
2017-07-05 10:55:56 -03:00
André Carvalho
2cd8d63fc4 vendor: updates golang.org/x/crypto
Signed-off-by: André Carvalho <asantostc@gmail.com>
2017-07-05 10:55:09 -03:00
André Carvalho
73ac7f183d drivers/amazonec2: logs userdata file error
Signed-off-by: André Carvalho <asantostc@gmail.com>
2017-07-03 15:45:53 -03:00
French Ben
d8dd3880ec Merge pull request #4162 from seemethere/add_comparison_function_tests
Adds tests for versioncmp functions
2017-06-30 19:23:39 +02:00
Eli Uriegas
1c27288680 Adds tests for versioncmp functions
Relates to issues raised in #4156

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-30 10:00:19 -07:00
French Ben
255980cfc2 Merge pull request #4128 from StefanScherer/fix-versioncmp
Fix versioncmp for CE edition
2017-06-30 18:37:07 +02:00
Hiromu OCHIAI
437f27d535 Fix test scenario to adjust to latest spec
Fix #4149

Signed-off-by: Hiromu OCHIAI <otiai10@gmail.com>
2017-06-23 21:52:09 +09:00
Marc-Aurèle Brothier
189aa7b2d2 Update egoscale driver version
Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2017-06-19 09:54:21 +02:00
Sven Dowideit
2951fbae43 Add cloud-init from both local file, and remote url
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-06-17 22:57:24 +10:00
Sven Dowideit
6b984b663c [VSPHERE] Add vm config params
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-06-17 13:50:53 +10:00
Ben Woosley
d983b844e9 Don't use extglob in bash/docker-machine.bash
extglob is not needed here - the only call is:
_docker_machine_map_key_of_current_option '--filter'

So $glob is always '--filter', so there isn't every a pattern-list to match.

According to my testing completion for docker-machine
ls --filter completion works for both driver and state

Fixes #4126
Introduced in fd9a0a683c

Signed-off-by: Ben Woosley <ben.woosley@gmail.com>
2017-06-16 16:33:50 -07:00
Sven Dowideit
2ccfbc92ac keep d.Network as a string so we don't cause pre-existing vmware machines to make machine panic
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-06-16 13:35:10 +10:00
Sven Dowideit
3212c6a311 Add multiple --vmwarevsphere-network flags so vm's can be multi-homed
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-06-16 13:12:53 +10:00
Andrew Featherstone
abe29e20cb driver/vmwarevsphere: correct formatting using gofmt
Corrected the formatting of the code using gofmat -s -w

Signed-off-by: Andrew Featherstone <andrew.featherstone@cambridgeconsultants.com>
2017-06-12 15:37:29 +01:00
Andrew Featherstone
9bf1daa0bc driver/vmwarevsphere: fix creating VMs on a DRS-enabled cluster
Omitting the --vmwarevsphere-hostsystem flag allows the user to create
a VM on a DRS-enabled cluster without specifying the host within the
cluster, allowing DRS to choose the host instead.
Fixes #2893.

Signed-off-by: Andrew Featherstone <andrew.featherstone@cambridgeconsultants.com>
2017-06-12 15:32:15 +01: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
Stefan Scherer
efe0ca5273 Fix versioncmp for ce edition
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2017-06-09 12:45:28 +02:00
Nathan LeClaire
c604d46dc5 Merge pull request #4124 from nathanleclaire/rm_nathanleclaire_maintainer
Remove @nathanleclaire as maintainer
2017-06-06 15:33:47 -07:00
Nathan LeClaire
95666999ac Remove @nathanleclaire as maintainer
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-06-05 19:07:46 -07:00
Nathan LeClaire
1996e15726 Merge pull request #4123 from nathanleclaire/bump_golang
Bump Go version
2017-06-05 18:30:45 -07:00
Nathan LeClaire
b137a6a835 Bump Go version
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-06-05 18:14:03 -07:00
Nathan LeClaire
1dd0729124 Merge pull request #4120 from parryjacob/4112-allow-remove-unknown
Ignore more errors from EC2 API
2017-06-05 11:54:34 -07:00
Jacob Parry
1532bc1a4d Ignore more errors from EC2 API
Signed-off-by: Jacob Parry <jacob@jacobparry.ca>
2017-06-05 13:32:31 -04:00
Nathan LeClaire
59c53323f6 Merge pull request #4118 from nathanleclaire/devel_version
Switch version in version.go to 'dev'
2017-06-02 17:05:22 -07:00