Commit Graph

3696 Commits

Author SHA1 Message Date
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
97748d1db5 Merge pull request #2384 from dotcloud/suppress_warning_tty_tests
Change logic for tty resize to avoid warning in tests
Upstream-commit: 36c26a0f0f7ab32f2edc2f25d8b59b0c33af6001
Component: engine
2013-10-24 16:59:13 -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
6a3e04b0eb Merge pull request #2306 from tianon/fix-ubuntu-install-aufs
Update hack/install.sh with some more Ubuntu-specific installation stuff...
Upstream-commit: afaddd04f77b1296ed42a2753d43e59d43d8cc35
Component: engine
2013-10-23 14:22:55 -07:00
24baeed431 Update all the mkimage scripts to use --numeric-owner as a tar argument to properly preserve ownership
Upstream-commit: 8e43db95f2299f9b63ab3d1728e73f2a5f6600b3
Component: engine
2013-10-23 14:08:16 -06:00
40ad755eae Merge pull request #2327 from dotcloud/2325_fix_untag_rmi
fix wrong untag while docker rmi
Upstream-commit: 7a116220e79b7ef8116c4726dced2a25ecc0873c
Component: engine
2013-10-23 10:24:20 -07:00
6c2f704b07 Merge pull request #2349 from shykes/runtime-cleanup
Runtime: remove unused field kernelVersion
Upstream-commit: 894a68d2ee957d75d599bf8e704ffa717212cf0f
Component: engine
2013-10-23 09:54:00 -07:00
72bb301695 Merge pull request #2353 from wrouesnel/mkimage-debootstrap-improvements
mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy
Upstream-commit: dc57d4ca26cf53551b849e308369e60238478479
Component: engine
2013-10-23 09:26:45 -07:00
47b8397b61 mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy.
This patch allows debootstrap to be run with the http_proxy environment
variable. This is principally useful when you're using apt-cacher and
apt-cacher-ng locally.
Upstream-commit: bc8a1081b047f6ee4ebf0adb22695fe3c98425c6
Component: engine
2013-10-24 03:21:10 +11:00
ce1466ed6d Typo in host integration docs
Upstream-commit: 33ccd29ae7b6e9c8e5b463c7066426f825c74d0a
Component: engine
2013-10-23 10:19:12 -05:00
a5e651dbd2 Update hack/make/ubuntu to make less ubuntu-centric packages, to fix the issue of deleting the docker group on every upgrade, to use the new init library scripts for upstart and sysvinit, and to include the dependency on iptables
Upstream-commit: 2aaaf9032052af472aaf2eaa1a5b934c9bfeb0a8
Component: engine
2013-10-23 07:38:12 -06:00
4cbb2084bc refactor utils.ParseHost with switch-case, so we can add other proto support easily
Upstream-commit: 99f16755661de79cac1ccda78e3e96552f6a4491
Component: engine
2013-10-23 18:29:35 +08:00
0d8e2ee2ed Runtime: remove unused field kernelVersion
Upstream-commit: 7e4d00840392a80c0946291848c4caa18a5ec108
Component: engine
2013-10-23 00:44:57 -06:00
1050f660ec Merge pull request #2279 from dotcloud/fix_docker_inspect
Client: improve docker inspect
Upstream-commit: b0515a7016d9be58e989401f65645af756d904ef
Component: engine
2013-10-22 17:17:35 -07:00