81ae14e1e4
remove some logs from tests
...
Upstream-commit: 86970d00bbb9c5e3184fe4e3e7442fd0865c80ec
Component: engine
2013-10-29 14:42:34 -07:00
3d88facaa2
Merge pull request #2426 from dotcloud/enable_sigproxy_default
...
Enable sig-proxy by default in run and attach
Upstream-commit: caa7cf14c009d8a8341423c981801512a74b9204
Component: engine
2013-10-29 14:39:17 -07:00
a59c312632
stop proxy at one point
...
Upstream-commit: 700a71e6b62a3786d11719ae30cacd0f90930525
Component: engine
2013-10-29 14:29:01 -07:00
82ec27b71b
Merge pull request #2429 from SvenDowideit/add-more-doc-pointers
...
tell potential doc updaters and contributors more details
Upstream-commit: 02e0fdee5788c6fe51136d991f8d6af3f8491ea4
Component: engine
2013-10-29 14:07:12 -07:00
9ea897f40d
Merge pull request #2443 from tlunter/fix_remote_api_doc
...
Container commit doesn't use a query parameter, uses POST body
Upstream-commit: baf23d3c3e91eaa721e817e236b2f25f17d6786a
Component: engine
2013-10-29 14:04:22 -07:00
5396145023
Merge pull request #2449 from tianon/remove-stackbrew-remnants
...
Remove old remnants of stackbrew now that it's a separate project
Upstream-commit: 5b75aea704e2c89285eaccf6e9f080c5c6dae7a1
Component: engine
2013-10-29 14:00:33 -07:00
d5914d940b
Merge pull request #2448 from keeb/fix-dsfg-readme
...
Fix export clause in readme
Upstream-commit: d91e1453320dd8ff37f133b530e372c5b9bc1ec9
Component: engine
2013-10-29 13:44:03 -07:00
0c26d0cb6e
Clarify Go 1.2rc2 / Go 1.1.2 requirements in hack/PACKAGERS.md
...
Upstream-commit: ff147707b2382cc3d9f09fc09b306d4c50a39dfd
Component: engine
2013-10-29 13:41:26 -06:00
cf0e412552
Merge pull request #2433 from tianon/sqlite-dep
...
Add SQLite dep to hack/PACKAGERS.md
Upstream-commit: 05430c7170f0e0f7a9ad6905645b6f7c657b63c5
Component: engine
2013-10-29 12:27:26 -07:00
f52dcf1ee3
Remove old remnants of stackbrew now that it's a separate project
...
Upstream-commit: eb79e8c5dd71a70c3d8567a4f3d437a2cd0a5d9c
Component: engine
2013-10-29 13:14:15 -06:00
7c934a531c
Fix export clause
...
This makes our clause DSFG acceptable.
Upstream-commit: b48fc9657976091ff3833d340877aa5b761e3969
Component: engine
2013-10-29 12:06:48 -07:00
c452ed1a32
Enable sig-proxy by default in run and attach
...
Upstream-commit: e0b59ab52b87b8fc15dd5534c3231fdd74843f9f
Component: engine
2013-10-29 11:18:34 -07:00
e50eb03692
Merge pull request #2431 from relateiq/2430-links-ip-env
...
Expose addr, port, proto env variables when linking, Closes #2430
Upstream-commit: a6a274f31273c635d6201381456fbc190bf774cd
Component: engine
2013-10-29 11:02:46 -07:00
72fb377123
Update all older docs too
...
Upstream-commit: 4f5790d10407e143f9d42a75eb4800cfe3f49263
Component: engine
2013-10-29 13:57:42 -04:00
a7c955ab40
Doesn't use a query parameter, uses POST body
...
Upstream-commit: 70c976de03ae5b83952e7ddfadfc75e358c5bbef
Component: engine
2013-10-29 10:17:12 -04:00
408a81a283
Updated dotCloud,Inc. to Docker, Inc.
...
Upstream-commit: 4947f61c2038ea3687d308782578bfdc9cec7c5c
Component: engine
2013-10-29 06:11:36 -07:00
39bb284f54
Expose IP, port, proto as sep. env vars when linking, Closes #2430
...
Upstream-commit: 1de23f1b81956bc04ba047d066ff7d84d9162910
Component: engine
2013-10-28 23:02:28 -07:00
dd841b9500
Add SQLite dep to hack/PACKAGERS.md and clean up a few other tiny inconsistencies
...
Upstream-commit: b283900764eac4947dc3239ced56e1c74e98809d
Component: engine
2013-10-28 21:57:20 -06:00
5d5ae2293c
add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability
...
Upstream-commit: e47f9984f8a2a250c980dd9325f6ac24a55093ed
Component: engine
2013-10-29 12:58:58 +10:00
c2ea5a00ce
Merge pull request #2162 from dotcloud/links
...
Links and Container Naming
Upstream-commit: b038b0cd44e152fa4158f2bfe145de6d774dd8d0
Component: engine
2013-10-28 19:24:10 -07:00
e141889857
Make sure only links are removed and not names
...
Upstream-commit: 7e8b2c3836fffcd1e69edfbd8873c461bda419c7
Component: engine
2013-10-28 19:19:31 -07:00
7ce1e20657
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
fb40e688f3
add name generator
...
Upstream-commit: 971cf56d89ac9cc4959800bdfaadb69ba2cdd06a
Component: engine
2013-10-28 15:19:52 -07:00
43f9ad0fc4
Fixes the flags for nc
...
The `-p` flag for `nc` should not be used with `-l`.
Upstream-commit: 50bb4a1636ea84d90700c2dce308670c9715d378
Component: engine
2013-10-28 15:48:18 -04:00
a4dd698ace
Merge pull request #2413 from rutsky/patch-1
...
Fix typo
Upstream-commit: 3c0c75bbf9ddd335439d40139358f46fd9532fc7
Component: engine
2013-10-28 12:08:04 -07:00
e13ba798d9
fix typo
...
Upstream-commit: 395a24ffd5a34f2fe1e5d7b7b5ee6c7825f51581
Component: engine
2013-10-28 09:35:09 +03:00
b9f7264616
Fix typo
...
Upstream-commit: 45d94944f3afe32d04eb31faa0cd9a129383f42c
Component: engine
2013-10-28 02:45:12 +03:00
f817417133
Removes \\n from debugf calls
...
Upstream-commit: 8f39f0b57da8d06386ff915511ee4d5dd55352f6
Component: engine
2013-10-25 17:50:40 -07:00
95fff601cd
fix docker ps display
...
Upstream-commit: d5c7e92a9a8ba65e1b2aad0f21393e8986d03d55
Component: engine
2013-10-25 17:36:23 -07:00
98b1505702
only pass stdin to hijack when needed
...
Upstream-commit: 13c521526ddc88e2502d9fe331faef51fe747cd2
Component: engine
2013-10-25 17:17:33 -07:00
22a371d221
prevent default name to be deleted and return an error on invalid link
...
Upstream-commit: 516cf548433ca17098533110fffc1998c7114e2e
Component: engine
2013-10-25 16:49:49 -07:00
c25b5fa785
Ensure child containers are started before parents
...
Upstream-commit: 356af1540f9a43337571e0f3ad6038789b38478e
Component: engine
2013-10-25 15:13:26 -07:00
33d75fdf08
Add default entity and edge to graph on runtime load
...
Upstream-commit: 2e6b241dc70c0f1ed6745af1f27b11bf77c84f3b
Component: engine
2013-10-25 15:13:26 -07:00
c646f3b347
Move iptable rules outside of create bridge
...
This allows the user to toggle enabling and
disabling intercontainer communication when
they run the daemon.
Upstream-commit: 94e5081baca9a3b3408d3a6ffa2926d1e262d6fe
Component: engine
2013-10-25 15:13:26 -07:00
f6f3623b0c
Update TestLinkEnv for default port
...
Upstream-commit: e179a24ad5f86d27377007303a2991870d173ce0
Component: engine
2013-10-25 15:13:25 -07:00
dce94d50af
Remove proto frpm default port
...
Upstream-commit: da864a845b94db64de8dcee12f62c26c57008f71
Component: engine
2013-10-25 15:13:25 -07:00
d166ef5e10
Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS
...
Upstream-commit: 640682d56c9694da092e084492e3f3e96bca5c76
Component: engine
2013-10-25 15:13:25 -07:00
20cc4c2b5a
update docker port command
...
Upstream-commit: 66a159342bfa1b2bb8361f21a17279aa0417bb50
Component: engine
2013-10-25 15:13:25 -07:00
aed89ba28f
Move name parsing logic to GetByName method
...
Upstream-commit: 7c882a800309f2a2870c57e85232ae8888bcef25
Component: engine
2013-10-25 15:13:25 -07:00
79c39c987f
Add missing else when checking for linkgraph.db
...
Upstream-commit: 7d440f70fd1ba10efa9ab239516dca461535da95
Component: engine
2013-10-25 15:13:25 -07:00
fba538a259
Hack: fix test and dyntest to correctly use $TESTFLAGS
...
Upstream-commit: 0c9b319dd0c29621c76cf63d494c9781e3f4ea00
Component: engine
2013-10-25 15:13:25 -07:00
3f2eaa1c43
Use persistent connection for links database
...
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
Upstream-commit: 7c08aeeba4ab94f77e221bfc01741cce0866d224
Component: engine
2013-10-25 15:13:25 -07:00
53239f847a
Close connection in Get method
...
Upstream-commit: 7072d2aacab5cd85ed78298b1a0c3ca3b68ed30c
Component: engine
2013-10-25 15:13:25 -07:00
7f47a302d5
Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary
...
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
Upstream-commit: 21161dbd515fb97cf9052a5980de6fc6180a89dc
Component: engine
2013-10-25 15:13:25 -07:00
576fafed48
Rename all cases of "docker-init" to "dockerinit" for consistency
...
Upstream-commit: cf86e2bb226c82a991eb392e426e707cf8193c03
Component: engine
2013-10-25 15:13:25 -07:00
abf7c9daea
Refactor the handling of static-related build flags
...
This is as discussed with @shykes on IRC
Upstream-commit: d7897508516c05e7ffea5b96053ec80c7771d777
Component: engine
2013-10-25 15:13:25 -07:00
98fe860f99
Add a few small consistency tweaks in hack
...
Upstream-commit: fb8d488896bd147aa810c9736fce1186b8d769b5
Component: engine
2013-10-25 15:13:25 -07:00
22100af3d2
fix tests
...
Upstream-commit: dbe7d67c183d2fcea2748dd09751c79bc9810b88
Component: engine
2013-10-25 15:13:25 -07:00
5b0bbe7633
remove docker ls and add docker link in usage and switch to go1.2rc2
...
Upstream-commit: 6c863b49ef9de8f203c84f7e2e55f33deeb10bdb
Component: engine
2013-10-25 15:13:25 -07:00
1ea9ba1de7
fix merge issue and gofmt
...
Upstream-commit: 89fb51f6063467124c8883399fc293faae8d8ef5
Component: engine
2013-10-25 15:13:25 -07:00
