Commit Graph

159 Commits

Author SHA1 Message Date
84cddc3f87 add a reference to multiple -H options, and update the other example of -H option
and copy changes to the cli.md file

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b2c87fe08b71523eb20fed63e5da3bef30b756ec
Component: engine
2014-04-24 11:24:58 +10:00
5742188cb8 - unix://path/to/socket should read unix:///path/to/socket like the rest of the documentation (a slash was missing)
- Mention that [] options may be specified multiple times on the Usage page

Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com> (github: mikemaccana)

Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com> (github: SvenDowideit)
Upstream-commit: e62efb266fd878453b8562e60b06a3e579fe571a
Component: engine
2014-04-24 11:11:51 +10:00
d8eb119f29 Remove error from engine.New()
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7100ace42bda2660d1eaecb2ec096ba6753688ea
Component: engine
2014-04-23 11:54:35 -07:00
5c5b3c1ca6 Remove the concept of a root dir out of engine
This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Conflicts:
	integration/runtime_test.go
Upstream-commit: 672edfe807c597a1c245bce996a150dfdf273a3c
Component: engine
2014-04-22 19:04:03 -07:00
52e20412e6 docker daemon: show info about the server
For combing through logs, have an intro line with information about the
running instance of the docker daemon.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: cea43f8a2da49dc9de35979829ff1876d48aea2c
Component: engine
2014-04-03 10:54:54 -04:00
14450304fa split API into 2 go packages
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a7365a6237c45ed05d96ab11f36fde35d675b462
Component: engine
2014-03-31 18:10:02 +00:00
43102e0522 Merge branch 'master' into discordianfish-https_client
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: aa63ece2ec8bae9d13c258ad8e771e3a000cc941
Component: engine
2014-03-19 22:05:36 +00:00
d6e39e4b66 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
c037f13ab8 configurable dns search domains
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: fbfac21ed4de550ce72d993810dc07a2c4877a88
Component: engine
2014-03-19 10:49:25 -04:00
5a2ca94673 create the cli obj before calling parseCommand
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: c349c9d14a1c4bf04f35f3f5c62b0bb92614bc81
Component: engine
2014-03-14 00:47:13 +00:00
a67771c164 Update daemon docs and help messages for --iptables and --ip-forward
Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
Upstream-commit: b7ae9984fb541e8b53d09016e78ff352ce310c25
Component: engine
2014-03-12 13:50:03 +09:00
5bd0f32f99 move opts out of pkg because it's related to docker
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: fde5f573d39020476c08ed25fac0a6306f7b18cc
Component: engine
2014-03-10 21:10:23 +00:00
46c0bc2613 Add authenticated TLS support for API
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: c000cb64712349141596318dea2a8de2462c8f81
Component: engine
2014-03-09 00:06:44 +01:00
e23e08e833 Create a -G option that specifies the group which unix sockets belong to.
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
Upstream-commit: 644acec2f7e3b144a423d0f0a6c900701abdc511
Component: engine
2014-03-06 11:17:04 -08:00
e06ddb9508 Merge pull request #4382 from unclejack/fix_symlink_handling
handle symlinks for Docker's root dir & TMPDIR
Upstream-commit: d761ebea6f4122bd0592267f2a5fe907a86cd338
Component: engine
2014-03-04 03:23:11 +02:00
04d68b69ad handle symlinks for Docker's root dir & TMPDIR
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.

It also enables handling symlinks for TMPDIR.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
2014-03-03 23:00:53 +02:00
1bd3fbfadf Address initial feedback from pr
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: de083400b8d7c2074d71a30a92e4f3c8bcd8bad8
Component: engine
2014-02-25 10:54:41 -08:00
530d80759d Fix exec driver flag, rename new driver to 'native'
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d59c05a37c3e964cdeef818afc2e7c3a3e8d0cf1
Component: engine
2014-02-24 20:41:09 -08:00
4f321caf5c Merge branch 'master' into add-libcontainer
Conflicts:
	runtime.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27a43692c2b114ed9b6418e75d16cbb2e6c7a993
Component: engine
2014-02-24 20:35:12 -08:00
781668c938 Merge pull request #4189 from vbatts/vbatts-execdriver_flag
execdriver flag for docker daemon
Upstream-commit: c9addff4449d0d6671373b9a6376fbe94bb43fb4
Component: engine
2014-02-24 23:28:17 -05:00
07cc777e62 Fix tests with dockerinit lookup path
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 01f9815b55742654b2f35d13c3aba6a9e48634c7
Component: engine
2014-02-24 13:40:17 -08:00
54e2291890 Compile nsinit into docker for use with dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8f20058307cb30c9697b8dbee1c7bf2b1e0ba766
Component: engine
2014-02-24 12:21:13 -08:00
14989a215e Register built-in engine commands at runtime instead of compile-time
This allows selective loading of commands, and paves the way to dynamic
plugins.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 919665a20a41f8e1b105342b1864ec05eb50cc97
Component: engine
2014-02-24 19:24:29 +00:00
1ddffb7445 Fix cli argument usage typo for docker --mtu
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com> (github: dpb587)
Upstream-commit: 8c4160fe61151f38f471e93e7bf98dcbf5406a9e
Component: engine
2014-02-21 10:51:51 -05:00
c39069efb0 execdriver flag for docker daemon
like the storage-driver flag, this implements a flag for choosing the
  execdriver to be used, defaulting to lxc.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5f84d7f3146db1ac15974f1e28f77834de3e63ff
Component: engine
2014-02-17 20:03:53 -05:00
e253c6c2c6 Merge pull request #4168 from crosbymichael/add-listenbuffer
Hold connections until the daemon has fully loaded
Upstream-commit: 4187f4e7504089d11740925a889e923f8adc54a7
Component: engine
2014-02-17 16:04:49 -08:00
3192f2a68b Fix DOCKER_HOST=tcp:// panic
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 513d86488046bfd898f5f1fdab39bfb302607535
Component: engine
2014-02-17 11:35:26 -08:00
9fff3868b1 Integration generic socket wait for docker api
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 778f1bf6639e52004608ca2289e04b8f7bddb14b
Component: engine
2014-02-15 20:49:50 -08:00
9c1c314fd9 api/container.go: an API-specific representation of a container
This breaks the dependency from the remote API implementation to the
internal representation of a container. Instead it uses its own partial
representation of a container, with only required fields.

* This preserves reverse-compatibility with all past implementations of the remote API.

* This clarifies which fields are guaranteed to be present in a response
	A docker remote api server *may* return more fields in a Container
	object, but their presence and semantics are not guaranteed and should
	not be relied upon by client implementations.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 44e10433c7a3811d4d0897192418cb6b62996584
Component: engine
2014-02-15 23:24:51 +00:00
024e6f564e Move remote api client to api/
This moves `commands.go` out of the core and into `api/client.go`

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ee59ba969fdd1837fe0151638cc01637e18139c3
Component: engine
2014-02-15 14:55:51 -08:00
5c232a828b Merge pull request #4074 from shykes/separate-version
Move docker version introspection to a sub-package.
Upstream-commit: 9a9690360c9b013f3962bee74c18397bd411cc6b
Component: engine
2014-02-11 20:16:00 -08:00
faccead7fb pkg/opts: a collection of custom value parsers implementing flag.Value
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e6e320acc757f22e113da755293583402c6c1e7c
Component: engine
2014-02-11 19:59:52 -08:00
cbe391a3ed Move api-specific code to the api package
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e08a1c53aa5a19a17d40d41accbab040611c4411
Component: engine
2014-02-11 19:59:52 -08:00
ef486c6630 Move docker version introspection to a sub-package.
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ae3c7dec3b075a263da8d1e1cc510275b281e799
Component: engine
2014-02-11 16:10:51 -08:00
0da08f6176 docker/config: update -mtu flag default
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: google)
Upstream-commit: 92e61f89aad35c3103e0db1c6dacecc0c588bd2e
Component: engine
2014-02-03 15:36:39 -08:00
67b7b510b9 docker: detect defaultNetworkMtu from default route
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: google)
Upstream-commit: 4d0a026c98721da874a03f5b6993045bae95842a
Component: engine
2014-02-01 03:46:37 -08:00
47dc263009 Merge pull request #3872 from crosbymichael/network-driver
Remove networking out of core and into a driver
Upstream-commit: 819c2e3ecaaa1f82401fe76bae1715183426c3cf
Component: engine
2014-01-31 17:22:37 -08:00
140db53b4e Move serveapi to api/api.go
Remove api import from server.go
Rename initapi to init server

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9eea7f28f0c64d43ef2a9987999a29774fa1476b
Component: engine
2014-01-31 23:06:00 +00:00
e11ccc455a Fix IP case for BridgeIP
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cb3bd91689b9beaaa4e287e126bc8150b5161c57
Component: engine
2014-01-31 12:18:45 -08:00
3fc86028ff move api to it's own package
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: f556cd4186dfdb5e96b2e58b5caf9edbe7e2d7df
Component: engine
2014-01-29 19:26:54 +00:00
4f8cce969a remove enableCors from the config and move it as a job arg
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d41844ed2d946fc963f9977991233b5d9daf86fd
Component: engine
2014-01-29 00:20:51 +00:00
61ba43da9f Merge pull request #3105 from philips/add-socket-activation
Add socket activation
Upstream-commit: 2723133a69a292abaa021afff98de127bda57b4e
Component: engine
2014-01-28 11:38:25 -08:00
07c81f6fbb Add --ip-forward flag to daemon (enabled by default) which automatically sets "net.ipv4.ip_forward" to 1
See also https://groups.google.com/d/topic/docker-dev/DCjF5Prx7HA/discussion

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cabe624c823348579ada234e3c029479683f624c
Component: engine
2014-01-27 21:35:05 -07:00
bbf27c35bb fix(docs): fixup based on changes in master
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: cfeb1f0f652e11b8b6a8b4e1cbed3835fc5d9546
Component: engine
2014-01-27 17:18:09 -08:00
7822beced6 update commands.go
update docker.go

move to pkg

update docs

update name and copyright

change --sinceId to --since-id, update completion and docs

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: e71dbf4ee5add5736f595948fc20bd01af56a744
Component: engine
2014-01-17 17:33:15 -08:00
87ba43c927 Add DOCKER_HOST env var for client
This env var will set the -H flag on the docker
client.
Upstream-commit: f50b8b08b5742c8e55df2d610d428c39cf1f4947
Component: engine
2013-12-28 16:42:18 -08:00
44050b9219 Allow mtu to be configured at daemon start
Upstream-commit: 566ff54d0ddffbeb3ba2e5f1e400db8528faf0a7
Component: engine
2013-12-20 12:12:03 -05:00
f633c6e7d1 Move root symlink check to engine.New
Since commit c91c365, when starting the docker daemon without an
existing /var/lib/docker directory, it fails with:

  2013/12/18 23:39:36 Unable to canonicalize root (%!s(*string=0xc210077c80)): lstat /var/lib/docker: no such file or directory

Move the symlink checking code to engine.New after the root dir has been
created.
Upstream-commit: 94821a33534a25fe906f3f66e1c06b1f2c877aac
Component: engine
2013-12-19 00:39:12 -06:00
624a293ce3 Canonicalize our root path before we try using it, because we make assumptions about it not containing symlinks
Fixes #3242
Upstream-commit: c91c365f8860315d29a17368b78dcefb23674042
Component: engine
2013-12-18 11:15:09 -07:00
ca9e7bd94d Add -bip flag: allow specification of dynamic bridge IP via CIDR
e.g.:

```
docker -d -bip "10.10.0.1/16"
```

If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
Upstream-commit: a68d7f3d70ab1638fd5b63a3026b211cb4e7a65e
Component: engine
2013-12-13 10:47:19 -05:00