Solomon Hykes
b744ea13a4
Close sqlite persistent connection on SIGINT, SITERM or SIGKILL
...
Upstream-commit: 464ded79fcd46dbdf8859811912a244006626e86
Component: engine
2013-10-26 14:28:53 -07:00
Solomon Hykes
ae44c03557
Setup daemon pidfile/cleanup in Server.Daemon() instead of main()
...
Upstream-commit: c1ae1a0e1cfae1aed681add5b1cb1c39e2c0e929
Component: engine
2013-10-26 14:26:07 -07:00
Solomon Hykes
8363dd13c7
Rename ConfigGetenv to ConfigFromJob
...
Upstream-commit: c542b2f873f181d7cb3127b4700a01bd62f43fbf
Component: engine
2013-10-26 14:24:25 -07:00
Solomon Hykes
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
Solomon Hykes
ff1fcc1bf9
Engine: centralize checks for supported architectures and kernel versions
...
Upstream-commit: 1b8eef4efbdd308f0dff0ae063ea49c0f4142888
Component: engine
2013-10-26 14:21:04 -07:00
Solomon Hykes
e490910840
Engine: basic testing harness
...
Upstream-commit: 2a29bf624536c9daed25966dcaf80d840d0972c3
Component: engine
2013-10-26 14:18:28 -07:00
Solomon Hykes
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
Solomon Hykes
af06b61d36
Fix build on darwin
...
Upstream-commit: 60b97576cfc2e43bfc5d09fa8ea2b71777d1f2b3
Component: engine
2013-10-26 14:14:50 -07:00
Victor Vieux
95fff601cd
fix docker ps display
...
Upstream-commit: d5c7e92a9a8ba65e1b2aad0f21393e8986d03d55
Component: engine
2013-10-25 17:36:23 -07:00
Victor Vieux
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
Michael Crosby and Victor Vieux
c25b5fa785
Ensure child containers are started before parents
...
Upstream-commit: 356af1540f9a43337571e0f3ad6038789b38478e
Component: engine
2013-10-25 15:13:26 -07:00
Michael Crosby and Victor Vieux
33d75fdf08
Add default entity and edge to graph on runtime load
...
Upstream-commit: 2e6b241dc70c0f1ed6745af1f27b11bf77c84f3b
Component: engine
2013-10-25 15:13:26 -07:00
Michael Crosby and Victor Vieux
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
Michael Crosby and Victor Vieux
f6f3623b0c
Update TestLinkEnv for default port
...
Upstream-commit: e179a24ad5f86d27377007303a2991870d173ce0
Component: engine
2013-10-25 15:13:25 -07:00
Victor Vieux
dce94d50af
Remove proto frpm default port
...
Upstream-commit: da864a845b94db64de8dcee12f62c26c57008f71
Component: engine
2013-10-25 15:13:25 -07:00
Tianon Gravi and Victor Vieux
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
Victor Vieux
20cc4c2b5a
update docker port command
...
Upstream-commit: 66a159342bfa1b2bb8361f21a17279aa0417bb50
Component: engine
2013-10-25 15:13:25 -07:00
Michael Crosby and Victor Vieux
aed89ba28f
Move name parsing logic to GetByName method
...
Upstream-commit: 7c882a800309f2a2870c57e85232ae8888bcef25
Component: engine
2013-10-25 15:13:25 -07:00
Michael Crosby and Victor Vieux
79c39c987f
Add missing else when checking for linkgraph.db
...
Upstream-commit: 7d440f70fd1ba10efa9ab239516dca461535da95
Component: engine
2013-10-25 15:13:25 -07:00
Solomon Hykes and Victor Vieux
fba538a259
Hack: fix test and dyntest to correctly use $TESTFLAGS
...
Upstream-commit: 0c9b319dd0c29621c76cf63d494c9781e3f4ea00
Component: engine
2013-10-25 15:13:25 -07:00
Michael Crosby and Victor Vieux
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
Michael Crosby and Victor Vieux
53239f847a
Close connection in Get method
...
Upstream-commit: 7072d2aacab5cd85ed78298b1a0c3ca3b68ed30c
Component: engine
2013-10-25 15:13:25 -07:00
Tianon Gravi and Victor Vieux
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
Tianon Gravi and Victor Vieux
576fafed48
Rename all cases of "docker-init" to "dockerinit" for consistency
...
Upstream-commit: cf86e2bb226c82a991eb392e426e707cf8193c03
Component: engine
2013-10-25 15:13:25 -07:00
Tianon Gravi and Victor Vieux
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
Tianon Gravi and Victor Vieux
98fe860f99
Add a few small consistency tweaks in hack
...
Upstream-commit: fb8d488896bd147aa810c9736fce1186b8d769b5
Component: engine
2013-10-25 15:13:25 -07:00
Victor Vieux
22100af3d2
fix tests
...
Upstream-commit: dbe7d67c183d2fcea2748dd09751c79bc9810b88
Component: engine
2013-10-25 15:13:25 -07:00
Victor Vieux
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
Victor Vieux
1ea9ba1de7
fix merge issue and gofmt
...
Upstream-commit: 89fb51f6063467124c8883399fc293faae8d8ef5
Component: engine
2013-10-25 15:13:25 -07:00
Victor Vieux
83a034fdc4
no more name encoding
...
Upstream-commit: 256b7537e332c68d0fa35b60e06726c40ed66312
Component: engine
2013-10-25 15:13:25 -07:00
Victor Vieux
3673acf131
replace == by HasPrefix for names and improve error message
...
Upstream-commit: c4923757f1f92c160a34d0a591f6e62d8d94dea3
Component: engine
2013-10-25 15:13:25 -07:00
Victor Vieux
0caf5bff97
refactor notrunc in commands.go to add names support
...
Upstream-commit: 387aeb78fb1f518a3c8982d73701f5b7faa1c59c
Component: engine
2013-10-25 15:13:24 -07:00
Victor Vieux
bdda0e729a
fix typo in docs
...
Upstream-commit: 99a9783abcf5db6ead15228fcf7bc962fff548f5
Component: engine
2013-10-25 15:13:24 -07:00
Michael Crosby and Victor Vieux
dab2931cd1
Updated fixes post rebase from master
...
Removed test cases that are no longer
applicable with links and the port changes.
Remove test case where a test was hitting an
external ip.
Upstream-commit: 0e24db3a68cabed1ff8cf8dd10854c5de201329f
Component: engine
2013-10-25 15:13:24 -07:00
Alexander Larsson and Victor Vieux
69a28976c0
Move SysInit to a submodule
...
This allows docker-init to not import the main docker
module, which means it won't e.g. pick up any sqlite
dependencies.
Upstream-commit: db999667245926569b161747eed7e08b2ec1c34c
Component: engine
2013-10-25 15:13:24 -07:00
Alexander Larsson and Victor Vieux
cd17fb7c91
Move ListOps to utils submodule
...
This will be needed for later use in docker-init without a docker
dependency
Upstream-commit: d063c8d941d366e4815b91c4fa4fc91fc1e1eb23
Component: engine
2013-10-25 15:13:24 -07:00
Alexander Larsson and Victor Vieux
9f5ddf8e54
Add a network test
...
This just tries pinging first 127.0.0.1 and then 8.8.8.8.
We can't ping via a dns name, because libresolv.so is missing
from the test image, so dns resolving doesn't work.
Upstream-commit: 249f5a65a55ac9f68c65d57a7e7b5ac486060b97
Component: engine
2013-10-25 15:13:24 -07:00
Alexander Larsson and Victor Vieux
de03d355b0
network: Stop shelling out to /sbin/ip
...
We have our own netlink version of all the required calls now, so
we can just skip the /sbin/ip dependency.
Upstream-commit: 494cd07f722d6bf5f2e69a6d2d729848882e1971
Component: engine
2013-10-25 15:13:24 -07:00
Alexander Larsson and Victor Vieux
b0926faccd
Use netlink directly instead of /bin/ip in Sysinit
...
The sysinit code only uses /bin/ip to set a default gateway. This
is pretty easy to do via netlink directly, so we can avoid
the ip dependency.
Upstream-commit: 607c1a520e6d39d0f0ee21f1d281931484206b57
Component: engine
2013-10-25 15:13:24 -07:00
Alexander Larsson and Victor Vieux
038f533285
Add netlink submodule
...
This contains various operations that can replace the use of
shelling out to "ip".
Upstream-commit: bf61d41d6cc1c56967396b5609030732954baa2f
Component: engine
2013-10-25 15:13:24 -07:00
Michael Crosby and Victor Vieux
226b51e180
Add flag for inter-container communication
...
Upstream-commit: ce965b8c43f91f0c32403cfaadfd4e279421090b
Component: engine
2013-10-25 15:13:24 -07:00
Solomon Hykes and Victor Vieux
aba25bde9e
Typos and FIXMEs
...
Upstream-commit: f7a2f0b93746d33da42b892abc6d5e0a05741321
Component: engine
2013-10-25 15:13:24 -07:00
Solomon Hykes and Victor Vieux
a116492e55
gograph: fix a bug which caused the unicity of (parent, name) to not be enforced
...
Upstream-commit: 4576d0f802f864db35bab2130180888abe207c8a
Component: engine
2013-10-25 15:13:24 -07:00
Michael Crosby and Victor Vieux
f85e0d3aec
Remove docker ls from docs and cli usage
...
Upstream-commit: 515070d5138c205e65cd029443c84408ad593ef6
Component: engine
2013-10-25 15:13:24 -07:00
Michael Crosby and Victor Vieux
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
Michael Crosby
17d84be4be
Merge pull request #2385 from dotcloud/suppress_even_more_warnings_test
...
Improve tests again, remove warnings and prevent some mount issues
Upstream-commit: ff567f87293bfea3f9750bf2b07d97d7f3d1d85c
Component: engine
2013-10-25 15:04:56 -07:00
Jérôme Petazzoni
d3bb38b0f9
Merge pull request #2378 from tianon/linkify-github-ids
...
Linkify @github references in the infrastructure README.md
Upstream-commit: 279791bc7426b5fc940927b0a2e45ba3182856a4
Component: engine
2013-10-25 11:30:25 -07:00
Andy Rothfusz
8d92e60130
Merge pull request #2355 from xdissent/patch-1
...
Typo in host integration docs
Upstream-commit: 1e704a4ddce4de000311a2be0b09045025a25c87
Component: engine
2013-10-24 19:05:22 -07:00
Victor Vieux
116fed86d5
Merge pull request #1963 from rogpeppe/master
...
Client: Use less reflection in command-line method invocation
Upstream-commit: 31111f61e05afc625ea82f8751b31df08bd75c2d
Component: engine
2013-10-24 18:03:20 -07:00
Michael Crosby
c6acea144e
Merge pull request #2383 from jpetazzo/cleanup-errclosedpipe-for-stdin
...
Ignore ErrClosedPipe for stdin in Container.Attach.
Upstream-commit: 217b6070f0649b15f3b45477a27a671411ba6884
Component: engine
2013-10-24 17:18:28 -07:00