1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

133 Commits

Author SHA1 Message Date
David Gageot
f09bbb8f7f Increase the provisioning timeout
Signed-off-by: David Gageot <david@gageot.net>
2015-12-14 14:15:51 +01:00
David Gageot
58b4cce392 Remove dead code and other cosmetic changes
Signed-off-by: David Gageot <david@gageot.net>
2015-12-10 14:20:46 +01:00
Kunal Kushwaha
f3689349a4 Host provisioing using Docker API
Replaces the code of provisioing with Go Templates with DockerAPI

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-12-09 13:05:43 +09:00
David Gageot
53a7528e4d Merge pull request #2515 from drankinn/2342_replication_advertise
Fixes issue #2342 - Issue provisioning swarm master with --replication through Docker Machine
2015-12-08 10:55:47 +01:00
David Gageot
8f6b8da399 Merge pull request #2483 from dongmx/master
Swarm container net should be host. If use bridge, sometime containers…
2015-12-08 09:03:35 +01:00
David Gageot
6583e64e48 Merge pull request #2486 from dongmx/issue2485
issue #2485, In generic driver If a permanent IP address and hostname has alread in /etc/hosts
2015-12-08 09:01:35 +01:00
Lance Andersen
60dba4d2d5 added advertise flag to swarm manager
Signed-off-by: Lance Andersen <techlance@gmail.com>
2015-12-07 12:37:26 -07:00
David Gageot
293055fcbc Remove dead code
Signed-off-by: David Gageot <david@gageot.net>
2015-12-07 09:15:12 +01:00
dongmx
ce524e1740 Swarm container net should be host. If use bridge, sometime container ip addresses conflict.
Signed-off-by: dongmx <dongmx@xueqiu.com>
2015-12-03 19:11:34 +08:00
dongmx
e799388e85 issue #2485, If a permanent IP address and hostname has alread in /etc/hosts
Signed-off-by: dongmx <dongmx@xueqiu.com>
2015-12-03 18:59:40 +08:00
Jean-Laurent de Morlhon
48554182f1 Merge pull request #2427 from newpcraft/debugmsg_in_daemonresponding
add debug message in dockerDaemonResponding function due to helping f…
2015-11-30 09:56:29 +01:00
David Gageot
78b088d135 Add more logs to provisioner
Signed-off-by: David Gageot <david@gageot.net>
2015-11-27 09:36:58 +01:00
CHOE JUNGYEON
83f3c2f921 add debug message in dockerDaemonResponding function due to helping for troubleshooting of docker daemon state 2015-11-27 02:37:50 +09:00
Jean-Laurent de Morlhon
a55bba3ed2 Move tls-san flag to a local flag for create
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-23 12:40:07 +01:00
Sam Alba
5b453e6305 Implemented '--tls-san' global arg for adding extra SANs (subject alt names) to server-side certificates
Signed-off-by: Sam Alba <sam.alba@gmail.com>
2015-11-23 12:17:29 +01:00
David Gageot
b9b7b6fe54 Merge pull request #2343 from nathanleclaire/systemd_remove_duplication
Remove systemd-related driver duplication
2015-11-19 10:10:54 +01:00
Nathan LeClaire
fc0981bd0f Remove systemd-related driver duplication
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-18 14:36:08 -08: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
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
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
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
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
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
b0f687b1b8 Merge pull request #2168 from dgageot/2167-b2d-upgrade
FIX #2167 b2d download timeout during upgrade
2015-11-06 18:16:52 -08:00
Nathan LeClaire
a020c3eac7 Delete bridge after powering daemon down
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 17:49:33 -08:00
Kunal Kushwaha
055de5f276 BugFix: IP in template need as per Struct
Lint changes in SwarmCommandOptions chnaged `Ip` to `IP`.
It required change in template code also.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-06 15:47:15 +09:00
Olivier Gambier
d2ada6488c Lint
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
David Gageot
1f0de8f84e FIX #2167 b2d download timeout during upgrade
+ Download boot2docker before we stop the machine.
+ Use default(longer) timeout
+ Show b2d download progress
+ Fix typo
+ Add log before stop

Signed-off-by: David Gageot <david@gageot.net>
2015-11-05 09:39:33 +01:00
Nathan LeClaire
ede8f2a32f Merge pull request #2166 from kunalkushwaha/swarm-proxy
Environment variables passed to provision machine, will be passed to …
2015-11-04 18:50:41 -08:00
Kunal Kushwaha
8d2ae162b7 Environment variables passed to provision machine, will be passed to containers for swarm also.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-05 11:27:58 +09:00
Olivier Gambier
19fc49b58a Lint, step 1
The easy stuff

Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-04 14:17:58 -08:00
Olivier Gambier
4e7f8ed7a6 Merge pull request #1856 from databus23/b2d_gh_enterprise_urls
support github enterprise urls for b2d downloads
2015-10-23 10:37:46 -07:00
Dave Goehrig
1df80ba111 Adding localhost to the list of alt_names
When attempting to connect to the docker api from the machine itself,
the TLS verification of the certificate checked against the public
IP address of the primary interface.  This is undesirable on hosts
which have NAT rules that block access to that address by default.

Adding "localhost" to the list of alt_names allows the cert to be
verified and connections to localhost (either 127.0.0.1 or [::1]) to
the port to pass verification. Otherwise one would need to disable
verification just to connect to the local docker instance.

Signed-off-by: David Gageot <david@gageot.net>
2015-10-23 09:57:55 +02:00
Nathan LeClaire
e80e448cd5 Merge pull request #2035 from flavio/add_openSUSE_and_SUSE_provision
Add SUSE Enterprise Linux and openSUSE provision
2015-10-22 14:54:58 -07:00
Nathan LeClaire
f6bbbdce7f Merge pull request #2056 from xiaohui/force-tty-allocation
force tty allocation for ssh with multiple '-tt'.
2015-10-22 11:29:31 -07:00
Olivier Gambier
c60b2cb2f9 Merge pull request #1910 from posita/posita/1880-ssl-cert-snafu
READY FOR REVIEW - Work-around erroneous SSL: CERTIFICATE_VERIFY_FAILED error with some buggy versions of OpenSSL
2015-10-22 09:57:56 -07:00
Fabian Ruff
335811df0c support upgrading b2d from custom urls
.

Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-10-22 16:12:21 +02:00
Fabian Ruff
5021ffd2e7 support github enterprise urls for b2d downloads
This commit allows downloading boot2docker releases not only from the official releases url (https://api.github.com/repos/boot2docker/boot2docker/releases) but from arbitrary github repositories that publish releases with a boot2docker.iso artifact. It also supports downloading from github enterprise.

Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-10-22 16:12:21 +02:00
David Gageot
e2b6a832ac Add more debug during certificates validation
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 11:11:31 +02:00
Xiaohui Liu
27cdffe042 force tty allocation for ssh with multiple '-tt'.
fix #2037:
when provision on CentOS 7.0, it needs to force tty allocation with multiple '-t' option.
Otherwise, the ssh command will failed with "sudo: sorry, you must have a tty to run sudo"
in SetHostname.

Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-10-22 16:26:22 +08:00
Matt Bogosian
f80dc360c7 Inspired by #1880 (and docker/compose#890 et al.). Make sure ca.pem subject is different from cert.pem subject to work-around OpenSSL bug.
Signed-off-by: Matt Bogosian <mtb19@columbia.edu>
2015-10-21 17:53:15 -07:00
Flavio Castelli
987718f24d Add SUSE Enterprise Linux and openSUSE provision
Add support for SUSE Enterprise Linux and openSUSE.

Code revised to build against current master.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2015-10-21 09:18:56 +02:00
Olivier Gambier
2b56c016b5 Revert "Add SUSE Enterprise Linux and openSUSE provision" 2015-10-20 19:35:09 -07:00
Olivier Gambier
2c6a671015 Merge pull request #1436 from flavio/add_openSUSE_and_SUSE_provision
Add SUSE Enterprise Linux and openSUSE provision
2015-10-20 19:32:30 -07:00
Dave Henderson
1b5bbaa494 Adding provisioner for Arch Linux
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-20 16:07:04 -04:00
Dave Henderson
2a6e3dbf40 Fix log.* method calls which meant to be log.*f
Stuff like `log.Debug("foo bar: %s", baz)` really wants to be
`log.Debugf("foo bar: %s", baz)`...

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-17 15:59:25 -04:00
Nathan LeClaire
c8edb33ecd Move towards using external binaries / RPC plugins
- First RPC steps

- Work on some flaws in RPC model

- Remove unused TLS settings from Engine and Swarm options

- Add code to correctly encode data over the network

- Add client driver for RPC

- Rename server driver file

- Start to make marshal make sense

- Fix silly RPC method args and add client

- Fix some issues with RPC calls, and marshaling

- Simplify plugin main.go

- Move towards 100% plugin in CLI

- Ensure that plugin servers are cleaned up properly

- Make flag parsing for driver flags work properly

Includes some work carried from @dmp42 updating the build process and
tests to use the new method.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-16 16:34:56 -07:00
Nathan LeClaire
b1ed661da9 Display error message only when create was otherwise successful
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-07 20:29:19 -07:00
Nathan LeClaire
9453df4859 Fix Docker daemon wait
Also, a few various cleanups are bundled:

1. Only call GetDriver() once to get the object in provision/utils.go
2. SSH command wrapper will return the error and let the consumer decide
   what to do with it instead of bailing automatically on non-255

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-09-23 15:19:25 -07:00