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

221 Commits

Author SHA1 Message Date
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
Nathan LeClaire
d889abc352 Merge pull request #4082 from SvenDowideit/allow-rancheros-to-select-docker-version 
Allow rancheros (all-non-b2d) to select a different Docker engine version using --engine-install-url
 2017-05-31 16:02:27 -07:00
Sven Dowideit
2ea653b5e3 Allow rancheros to select a different Docker engine version using --engine-install-url 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2017-05-30 11:58:50 +10:00
seongkki
e8da55a0fa add purge in package action 
Signed-off-by: seongkki <seongkki@cisco.com>
 2017-05-26 14:26:24 -04:00
Flavio Castelli
82932c0d62 Reduce provisioning time of SUSE/openSUSE systems 
Do not cause zypper to download the repository metadata on systems that
have been pre-optimized for docker usage.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2017-04-05 11:59:09 +02:00
Flavio Castelli
0b3d15168d Make the SUSE/openSUSE provisioner more resilient 
Do not let the provisioner fail when ran against an already initialized
machine.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2017-04-04 18:04:14 +02:00
Nathan LeClaire
39e78dff7d Merge pull request #4002 from nathanleclaire/migrate_pkg_upgrade 
Add support for upgrade to new CE edition
 2017-02-27 15:14:02 -08:00
Peter Rifel
12d2c1e842 Restore systemd support for docker versions <1.12 
Signed-off-by: Peter Rifel <pgrifel@gmail.com>
 2017-02-22 15:06:28 -08:00
Nathan LeClaire
d3ee30be50 Add support for upgrade to new CE edition 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-02-22 14:55:03 -08:00
Nathan LeClaire
e095e1d031 Merge pull request #3966 from twang2218/systemd-drop-in 
Use systemd drop-in for the docker-machine configuration
 2017-02-22 14:15:25 -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
Tao Wang
b6e85bfadf Use systemd drop-in for the docker-machine configuration 
Using systemd drop-in for the configuration is better for inherit the
package default settings, without the need of sync the settings
between 2 projects.

Fixes https://github.com/docker/machine/issues/3963

Signed-off-by: Tao Wang <twang2218@gmail.com>
 2017-01-26 01:30:00 +11: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
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
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
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
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
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
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
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
Nathan LeClaire
5f6bc6fa72 Merge pull request #3508 from s-koba/3507-fix-redhat-ssh-logs 
Add SSH logs when provisioning with RedHat derivatives
 2016-06-23 17:29:26 -07:00
tronicum
5c888874e0 updated test 
Signed-off-by: tronicum <tronicum@gmail.com>
 2016-06-23 16:01:38 +02:00
tronicum
071ce5e667 bumped version up to fedora 23 (should'nt it use a matching version and only default to something else otherwise?) 
Signed-off-by: tronicum <tronicum@gmail.com>
 2016-06-23 15:39:01 +02:00
KOBAYASHI Shinji
ec4697ea33 Add SSH logs when provisioning with RedHat derivatives 
Fixes #3507

Signed-off-by: KOBAYASHI Shinji <koba@jp.fujitsu.com>
 2016-06-14 11:13:32 +00:00
Yi EungJun
d74f273c53 Fix port binding of swarm master 
The port is 3376 by default but could be modified by --swarm-host
option.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
 2016-05-11 17:40:04 +09: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
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
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
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
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
26cbaad949 Merge pull request #3278 from ezarko/1361 
Oracle Enterprise Linux provisioner
 2016-04-13 14:50:15 -07:00
Nathan LeClaire
618201c116 Run Swarm containers without --net host 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-04-11 16:23:00 -07:00
Eric A. Zarko
6c47f4d8e2 Adding Oracle Enterprise Linux provisioner 
Fixes #1361
Fixes #3164
Corrected copy/paste typo in libmachine/provision/fedora_test.go
Preserve environment when performing yum update for proxy settings.

Signed-off-by: Eric A. Zarko <eric.zarko@oracle.com>
 2016-04-07 09:04:23 -07:00
Tiago Pires
a6f19ef936 FIX #3141 Refactor netstat command and tests 
Updated `netstat` command to minimize its output with `-t` and `-l`
flags.
Refactored regex on `libmachine/provision/utils.go`:`checkDaemonUp` to
avoid `matchNetstatOut` returning `true` when remote machine has a
similar port to dockerPort listening (e.g. dockerPort := 2376 and
remote machine has port 23760 listening).
Refactored `utils_test.go` with more accurate `netstat` output.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
 2016-03-28 23:29:26 +01:00
bingshen.wbs
9914e4027e add systemd requirement 
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2016-03-15 16:19:54 +08:00