Commit Graph

3443 Commits

Author SHA1 Message Date
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
83a034fdc4 no more name encoding
Upstream-commit: 256b7537e332c68d0fa35b60e06726c40ed66312
Component: engine
2013-10-25 15:13:25 -07:00
3673acf131 replace == by HasPrefix for names and improve error message
Upstream-commit: c4923757f1f92c160a34d0a591f6e62d8d94dea3
Component: engine
2013-10-25 15:13:25 -07:00
0caf5bff97 refactor notrunc in commands.go to add names support
Upstream-commit: 387aeb78fb1f518a3c8982d73701f5b7faa1c59c
Component: engine
2013-10-25 15:13:24 -07:00
bdda0e729a fix typo in docs
Upstream-commit: 99a9783abcf5db6ead15228fcf7bc962fff548f5
Component: engine
2013-10-25 15:13:24 -07:00
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
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
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
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
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
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
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
226b51e180 Add flag for inter-container communication
Upstream-commit: ce965b8c43f91f0c32403cfaadfd4e279421090b
Component: engine
2013-10-25 15:13:24 -07:00
aba25bde9e Typos and FIXMEs
Upstream-commit: f7a2f0b93746d33da42b892abc6d5e0a05741321
Component: engine
2013-10-25 15:13:24 -07:00
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
f85e0d3aec Remove docker ls from docs and cli usage
Upstream-commit: 515070d5138c205e65cd029443c84408ad593ef6
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
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
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
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
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
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
281b188b3c fix workdir, hostname tests and a bunch on mount issue
Upstream-commit: a675e249b133fe35eaf02fb0bdb807cfd4efe969
Component: engine
2013-10-24 16:57:35 -07:00
264d4e8059 remove log
Upstream-commit: acc2aec988450b117c183f35a4e743b882a55113
Component: engine
2013-10-24 15:13:47 -07:00
74017d1538 swap cat by top to prevent 2 warnings
Upstream-commit: 0e021ed470a1014bb924ad7067d85540f8f1e71a
Component: engine
2013-10-24 15:06:10 -07:00
a76023f483 Ignore ErrClosedPipe for stdin in Container.Attach.
But pass `err` in the error channel anyway; don't ignore it anymore.
Upstream-commit: b9eb5e04aeac870a9a45ae8961cfb3578af26787
Component: engine
2013-10-24 15:04:58 -07:00
c79d5e702c change logic for tty resize to avoid warning in tests
Upstream-commit: 0e44864b666b5b0139cdf8ec5a001fee661bf212
Component: engine
2013-10-24 14:54:04 -07:00
fe31da6fd6 Merge pull request #2379 from dotcloud/2377-remove_resize_race-fix
Monitor the tty after starting the container
Upstream-commit: e661473bcd6ff39ce7364cbed0b7b6455eb25f51
Component: engine
2013-10-24 12:31:31 -07:00
a7e39af256 Merge pull request #2364 from tianon/sudo-modprobe
Fix install.sh with $sh_c to get sudo/su for modprobe
Upstream-commit: 98c94dd4dbd900044ca807b763966858e61df597
Component: engine
2013-10-24 11:24:23 -07:00
f1c190c4d6 monitor the tty after starting the container
Upstream-commit: 656b66e51b18ff9f5f2720c3ce9ff9ec2937f05f
Component: engine
2013-10-24 11:19:06 -07:00
400a33f8d2 Linkify @github references in the infrastructure README.md
Upstream-commit: c9375d14fc6b7f2a0d3b40fc736b6aed20e010d3
Component: engine
2013-10-24 11:54:06 -06:00
4d15f54bd3 Merge pull request #2367 from dotcloud/remove_useless_exit
Remove useless os.Exit() after log.Fatalf
Upstream-commit: 489c370fcca781ae10faae19b69209745302de22
Component: engine
2013-10-24 09:18:45 -07:00
f677e2e101 Merge pull request #2363 from tianon/mkimage-numeric-owner
Update all the mkimage scripts to use --numeric-owner as a tar argument
Upstream-commit: aa6c99aff604faf3f483372c11e4e10f9d7fc80e
Component: engine
2013-10-24 06:42:52 -07:00
037a64a1b2 remove useless os.Exit() after log.Fatalf
Upstream-commit: 92384649cfd7d69a3e493231aadf616bf8704109
Component: engine
2013-10-24 00:25:55 -07:00
1c76b8e2b5 Merge pull request #2354 from hamo/refac_parsehost
refactor utils.ParseHost with switch-case, so we can add other proto support easily
Upstream-commit: c2413889bb5d76a57ef239d789d189ca94d73d99
Component: engine
2013-10-24 00:22:50 -07:00
3f6f7d77a8 let utils.ParseHost return err when errors happen
Upstream-commit: e81da876df57fb8e0562cc64e7b57dc7eb32284a
Component: engine
2013-10-24 13:23:02 +08:00
002ca069aa Merge pull request #2263 from tianon/hack-release
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
Upstream-commit: f0dbdba5c00f988da893627fe7b9d54b95bc7157
Component: engine
2013-10-23 15:31:16 -07:00
cea1ec67ae Fix install.sh with $sh_c to get sudo/su for modprobe
Upstream-commit: 0324e567ad60d66358075bf866299abeae5241b3
Component: engine
2013-10-23 15:48:30 -06:00
bab3ffd21b Merge pull request #2226 from tianon/init
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
Upstream-commit: ef5cf6c1ec88c71465075f272e58150ae26d25fa
Component: engine
2013-10-23 14:29:41 -07:00