Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,166 Commits 1 Branch 72 Tags
e55dfb2618124af6058f4ea7489265af3cf13ee8
Commit Graph

479 Commits

Author SHA1 Message Date
Nathan LeClaire
e55dfb2618 Start machine if needed for upgrade 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-02-22 13:54:36 -08:00
Aaron.L.Xu
bfd2546447 fix typos in project scope 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-10 13:40:04 +08:00
Nathan LeClaire
f694032b45 Merge pull request #3933 from flavio/suse-provisioning-support-multiple-architectures 
SUSE provisioner: support different architectures
 2017-02-08 15:18:11 -08:00
kaiwentan
c3d37185cc fix typo 
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn>
 2017-01-19 23:28:01 +08:00
Nathan LeClaire
3f20d202a2 Revert "Add DOCKER_API_VERSION to env" 
This reverts commit cc6c432ad8.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-01-17 13:47:23 -08:00
Flavio Castelli
686bda0e17 SUSE provisioner: support different architectures 
Change the code to make it work also when using non-x86_64 architectures

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2016-12-20 16:56:30 +01:00
Gordon Shankman
a7cdecf69c Added exclusion of docker-* packages during yum update in RedHat provisioning. This avoids accidental upgrade of docker when it is already installed. 
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
 2016-12-15 15:42:48 -05:00
André Carvalho
636d7988c0 provision/utils: minor refactoring 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-26 12:26:49 -02:00
André Carvalho
122f761911 provision: properly handle apt-get lock error 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-26 12:11:56 -02:00
André Carvalho
38b4df4183 libmachine/provision: wait for apt-get update lock 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-25 15:30:00 -02:00
André Carvalho
02428eeb06 libmachine/drivers/rpc: close plugin binary even when driver server fails 
With this commit the RPC client driver tries closing the plugin binary
even when closing the driver server fails. This prevents the driver
process from entering in <defunct> state when it failed before closing.

Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-21 14:31:22 -02:00
Nathan LeClaire
23ae71164f Merge pull request #3870 from classmarkets/coreos-dockerd-args 
provision/coreos: start docker 1.12 correctly
 2016-11-16 15:33:52 -08:00
Peter Schultz
292e371a46 libmachine/versioncmp: ignore pre-release suffixes 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
d1a3369490 libmachine/versioncmp: refactor test to be table driven 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
2ec1b7288f libmachine/versions: rename to versioncmp 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
c9d26abc4e libmachine/provision: add test for DockerClientVersion 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
a0378e4ce3 provision/coreos: Fix Docker version detection 
Parse the output of `docker --version` on the remote host instead of
looking for a program named dockerd.

Making decisions based on the presence or absence of a particular
program is short sighted; there are many reasons why dockerd may or may
not exist in $PATH that have nothing to do with the Docker version.

Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:03 +01:00
Nathan LeClaire
291673edfe Merge pull request #3876 from nathanleclaire/migrate_to_dockerd 
Update provisioner to use dockerd
 2016-11-15 17:43:09 -08:00
Nathan LeClaire
19973f2b1b Fix golint errors 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 17:14:17 -08:00
Nathan LeClaire
7ed0198985 Update provisioner to use dockerd 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 16:08:02 -08:00
Peter Schultz
0eb826382c provision/coreos: start docker 1.12 correctly 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-14 14:16:50 +01:00
Nathan LeClaire
32185d47d2 Merge pull request #3866 from andrestc/core-drivers-slice 
libmachine: initiliaze core drivers as slice instead of array
 2016-11-11 11:28:06 -08:00
André Carvalho
bdc4af7f1f libmachine: initiliaze core drivers as slice instead of array 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-11 13:47:14 -02:00
Dave Henderson
678f729fa0 Fixing syntax for upgrade action on Arch Linux provisioner 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2016-10-28 21:23:38 -04:00
Nathan LeClaire
a6f19fa738 Merge pull request #3839 from s-koba/2046-env-add-api-ver 
Add DOCKER_API_VERSION to env
 2016-10-28 13:54:05 -07:00
Nathan LeClaire
786c931de9 Merge pull request #3847 from tolbrino/tb/fix_ssh_key_perms_freebsd 
Fix ssh keyfile permissions on FreeBSD
 2016-10-28 13:47:16 -07:00
Alexander Kanevskiy
be4aed9528 Improve error message if driver binary not available 
This change provide more information which exact binary for
particular driver is missing in PATH

Signed-off-by: Alexander Kanevskiy <kad@linux.intel.com>
 2016-10-28 17:44:20 +03:00
Tino Breddin
6b38caacc1 Fix ssh keyfile permissions on FreeBSD 
Signed-off-by: Tino Breddin <t@tolbrino.com>
 2016-10-25 15:42:16 +02:00
KOBAYASHI Shinji
cc6c432ad8 Add DOCKER_API_VERSION to env 
Fixes #2046

Signed-off-by: KOBAYASHI Shinji <koba@jp.fujitsu.com>
 2016-10-24 09:57:42 +09:00
Nathan LeClaire
bb9c908bbc Merge pull request #3820 from PouuleT/closeSSHConn 
Close properly SSH clients created by NativeClient
 2016-10-21 14:06:54 -07:00
Flavio Castelli
8106da7090 Refactoring of the SUSE/openSUSE provisioner 
This provisioner is not relying on the bash script hosted
at get.docker.com.

Helps fixing issue #23480

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2016-10-20 22:51:20 +02:00
Lucas BEE
939802292d Close properly SSH clients created by NativeClient 
Signed-off-by: Lucas BEE <pouulet@gmail.com>
 2016-10-18 17:49:15 +00:00
Stephen Blackstone
3f2e24d6b1 Dialer TLS timeout is too short, 2 -> 20 seconds 
Signed-off-by: Stephen Blackstone <sblackstone@gmail.com>
 2016-10-13 17:50:12 -04:00
Tino Breddin
b3a72481d8 FreeBSD: add build support 
Signed-off-by: Tino Breddin <t@tolbrino.com>
 2016-10-04 17:00:08 +02:00
Nathan LeClaire
f4e482a68f Update fish test now that magic env var is not used 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-09-27 16:13:26 -07:00
Nathan LeClaire
adff26ad62 Merge pull request #3768 from cibotech/master 
Remove incorrect hard-coded "fish" shell identification.
 2016-09-26 14:27:29 -07:00
Aaron Prindle
6517c2a950 Use net.JoinHostPort to allow for ipv6 addresses to work properly. 
Signed-off-by: Aaron Prindle <aprindle@google.com>

Signed-off-by: Aaron Prindle <aprindle@google.com>
 2016-09-23 15:13:57 -07:00
Scott
f26dda16f6 Remove hard-coded incorrect "fish" shell identification. 
The lines removed cause the shell to be identified as `fish` if the `__fish_bin_dir`, even when `$SHELL` is explicitly set to something else.

This causes a fish user to get the `fish` env when running a non-fish sub-shell.  All bash scripts that use `docker-machine env` will fail for fish users.

Signed-off-by: Scott M. Smith <scottsmith1@gmail.com>
 2016-09-20 09:40:07 -07:00
tronicum
ae976cada8 removal of yum repo setup code. 
now done by get.docker.com/install.sh magic.

Signed-off-by: tronicum <tronicum@gmail.com>
 2016-09-13 10:26:00 +02:00
André Carvalho
62b081a5dd fakestore: add tests 2016-09-02 17:48:04 -03:00
André Carvalho
000bd2a7a9 fakestore: rename file to match filestore pattern 
Signed-off-by: André Carvalho <andre.carvalho@corp.globo.com>
 2016-09-02 17:47:46 -03:00
André Carvalho
c351308cb7 libmachine: implements save and remove on FakeStore 
This makes the Save and Remove methods of the FakeStore
manipulate the Hosts slice accordingly.

Signed-off-by: André Carvalho <andre.carvalho@corp.globo.com>
 2016-09-02 11:34:07 -03:00
Bilal Amarni
4587b4447b [provision] fix replace pattern in /etc/hosts 
Require a space before the hostname.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
 2016-08-22 09:59:36 +02:00
Bilal Amarni
0ad4f6d109 Update certificates error message 
Which is not necessarily true since live-restore was introduced
(https://docs.docker.com/engine/admin/live-restore/).

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
 2016-08-15 10:34:46 +02:00
Stefan Sels
bd7fafda34 bumping to fedora version to 24 
Signed-off-by: Stefan Sels <tronicum@gmail.com>
 2016-08-01 14:48:28 +02:00
Nathan LeClaire
530111d32d Move generated systemd unit file closer to upstream 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-29 14:49:54 -07:00
Nathan LeClaire
34ea48e7dc Merge pull request #3564 from cdrage/add-variantid-to-osrelease 
Add VARIANT and VARIANT_ID to os-release
 2016-07-05 16:39:16 -07:00
Nathan LeClaire
338744a639 Merge pull request #3571 from nathanleclaire/disable_nonswarm_ext_attribute_client_for_server_cert 
Disable extended key usage as a client for non-Swarm-master server certs
 2016-07-05 16:23:35 -07:00
Nathan LeClaire
c0b721b5f9 Disable extended key usage as a client for non-Swarm-master server certs 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-07-05 16:08:28 -07:00
Charlie Drage
e29c77bff3 Add VARIANT and VARIANT_ID to os-release 
In order to provision different variant types such as embedded and
server releases, it's required to grep the VARIANT and VARIANT_ID
variables of os-release.

Specifically from this commit:
56267336c7

Which adds the VARIANT_ID="atomic.host" in order to differentiate
between Fedora Server and container-centric Atomic Host releases.

This commit adds the accessability of VARIANT and VARIANT_ID in order
for Docker Machine to successfully provision different variants of Fedora
releases.

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
 2016-07-04 17:33:58 -04:00