Commit Graph

21 Commits

Author SHA1 Message Date
8c2801ba38 Fix bad rebase where bridgeiface was removed
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 347dc3942704742c1d24983a1e9cb10ae7ab8839
Component: engine
2014-02-05 11:20:59 -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
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
0b250038dd Update core calls to network drivers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c712e74b45005e0f38297d254fb606aa18606d11
Component: engine
2014-01-31 12:04:44 -08:00
c57257cc3c changed default value of getenvint to 0. fix tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 28b5ae8cc4492f7b3cc2eb2b30b0f41713822b25
Component: engine
2014-01-31 02:06:08 +00:00
deac379ef5 refactor all *FromJob functions
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9261511aa509423432f4e22f6235719deadc0969
Component: engine
2014-01-30 20:45:32 +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
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
44050b9219 Allow mtu to be configured at daemon start
Upstream-commit: 566ff54d0ddffbeb3ba2e5f1e400db8528faf0a7
Component: engine
2013-12-20 12:12:03 -05: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
JP
e3b038914a Fixes #2820
Upstream-commit: 3cd9b2aadfd16736032ee569ba263fce53286347
Component: engine
2013-12-02 16:22:39 -05:00
c8cec50adf Add flag to set default graph driver
Remove the env var DOCKER_DRIVER
Upstream-commit: 6dbeed89c061b85551ab638f93282d87de8ab929
Component: engine
2013-11-19 02:37:44 -08:00
a48718c85a Merge branch 'job-create-start-clean' into engine-patch-2
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
2013-11-13 00:36:20 +00:00
6d24142423 go fmt
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
2013-11-07 12:27:33 -08:00
8a182f4aaf Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs
Upstream-commit: 433c8e9c7da7cd3cd952c3dce3763db70fc450e5
Component: engine
2013-11-05 17:41:37 +00:00
8363dd13c7 Rename ConfigGetenv to ConfigFromJob
Upstream-commit: c542b2f873f181d7cb3127b4700a01bd62f43fbf
Component: engine
2013-10-26 14:24:25 -07:00
b6319ac31a Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge
Upstream-commit: 7e691e11b033f35fe823fbc6dcb40decd584696d
Component: engine
2013-10-26 14:24:13 -07:00
2bbe323db0 Minimal, unintrusive implementation of a cleaner Job API.
* Implement a new package: engine. It exposes a useful but minimalist job API.
* Refactor main() to instanciate an Engine instead of a Server directly.
* Refactor server.go to register an engine job.

This is the smallest possible refactor which can include the new Engine design
into master. More gradual refactoring will follow.
Upstream-commit: 0d1a825137448e2f41e5aaa5ecae8094c8ab6817
Component: engine
2013-10-26 14:18:13 -07:00
226b51e180 Add flag for inter-container communication
Upstream-commit: ce965b8c43f91f0c32403cfaadfd4e279421090b
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00