65b2fd1698
Ignore stderr while doing tests
...
Upstream-commit: 800d9006883228365a375800254871397cb1a011
Component: engine
2013-06-27 15:25:31 -07:00
2afee8496c
Merge pull request #1035 from dotcloud/fix_panic_cast
...
- Runtime: fix panic with unix socket
Upstream-commit: 1a201d243327280e06e43ea538eb52a0c878cc57
Component: engine
2013-06-27 15:22:18 -07:00
f7d1250f60
Merge pull request #1041 from unclejack/fix_minor_kernel_version_for_git_kernels
...
remove + from minor kernel version for kernels built from git
Upstream-commit: 750c94efbbe6ab230670d5a1bb1329979bc0fb93
Component: engine
2013-06-27 15:21:34 -07:00
c26a152aeb
remove + from minor kernel version
...
Upstream-commit: 5ed4386bbf869caf6d39f619e27c5ee1310f879d
Component: engine
2013-06-27 17:51:17 +03:00
77a309a0df
fix panic with unix socket
...
Upstream-commit: 9d3ec7b39fcf178eaa9aa1482f0a85c257df4408
Component: engine
2013-06-27 12:57:19 +00:00
edf5c211e8
Merge pull request #1019 from dotcloud/1002-change_update_progress_bar_rate-feature
...
*Remote API: update progressbar every MIN(1%, 512kB)
Upstream-commit: e68a23bdc1a92f5b9bb4d3fa3e495330068a7e9a
Component: engine
2013-06-27 04:19:42 -07:00
9060c46513
Merge pull request #1029 from lopter/master
...
* Hack: add a script to create the docker-ut image (busybox + socat)
Upstream-commit: c4a44f6f0be9d24f53dc7643ebeeb00d2e1a92be
Component: engine
2013-06-26 16:28:58 -07:00
f2f4f1b439
Merge pull request #602 from gabrtv/111-bind-mounts
...
+ Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 3e29695c1fe83e9c2cc3132735e88a1f0ec62fce
Component: engine
2013-06-26 15:59:35 -07:00
b1ef39bb79
- Runtime: small bugfixes in external mount-bind integration
...
Upstream-commit: 46a9f29baef77dbe212e1261f5cecbe1b53fadb9
Component: engine
2013-06-26 15:26:47 -07:00
5327febeeb
- Fix a few bugs in external mount-bind integration
...
Upstream-commit: 67239957c9e863f16a6d147d88dd2fae00c3770f
Component: engine
2013-06-26 15:10:38 -07:00
1c5ea40b1c
* Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v)
...
Upstream-commit: d4e62101abca637b5bc057ec13e73d9ce65d6161
Component: engine
2013-06-26 15:08:07 -07:00
a223caa9e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
...
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
7b52085a24
Merge pull request #1005 from dotcloud/1004-stdin_piping-fix
...
- Runtime: Fix issue when attaching stdin alone
Upstream-commit: cd0f22ef72da22adaae68b93f4e4e65ed70edc2b
Component: engine
2013-06-26 12:56:14 -07:00
09b324ca87
Add a script to create the docker-ut image
...
It's a fork of the mkimage-busybox.sh script and it adds socat to the
image. (socat being needed to add udp support, see #33 ).
This script, like mkimage-busybox.sh, probably only works on
Debian/Ubuntu.
Upstream-commit: e5c0b3110703258e255305cd9feb114a02c33350
Component: engine
2013-06-26 12:35:14 -07:00
ec62c0223f
Merge pull request #1021 from errnoh/fix-test-filled-tmpfs
...
TestKill and TestMultipleContainers: run sleep instead of cat /bin/zero....
Upstream-commit: 5cdbd2ed7ab1a09245851443ec7d08d4a2dfd680
Component: engine
2013-06-26 11:59:06 -07:00
4b6fc4d9a0
Merge pull request #1010 from dotcloud/1009-testing-hack
...
Testing|hack, issue #1009 : Update make hack environment
Upstream-commit: b44e2e71aa80246d5ef0f18e95f873c53d13edf5
Component: engine
2013-06-25 17:07:18 -07:00
c81eba049a
Add missing fprintf instead of printf
...
Upstream-commit: 6127d757a7495df83b3d4cec53dc56b48c764023
Component: engine
2013-06-25 10:39:11 -07:00
e56adbd4e1
TestKill and TestMultipleContainers: run sleep instead of cat /bin/zero. fixes #737
...
Upstream-commit: fb86dcfb17444089aea31cdf6c9b09c4421731c7
Component: engine
2013-06-25 17:52:10 +03:00
f6e7db58bd
update progressbar every MIN(1%, 512kB)
...
Upstream-commit: bccf06c748c8f62a617a94e8120ce33f2e53183b
Component: engine
2013-06-25 14:03:15 +00:00
d9bf1bf281
Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param
...
Upstream-commit: 862e223cecec203a96d3be4fd667bc9286703e82
Component: engine
2013-06-25 13:33:45 +00:00
796f945ca5
Merge pull request #1018 from nahiluhmot/add-swipely-docker-gem
...
* Documentation: Added Swipely's `docker-api` gem to the table of Remote API Client Libraries.
Upstream-commit: e1e2ff52fee8d36ae46c014d27928f967205c17d
Component: engine
2013-06-25 05:49:52 -07:00
b1a130438c
Added Swipely's docker-api gem to the table of Remote API Client
...
Libraries.
Upstream-commit: d03edf12e4ad67f0900434af5c8d36688b6cc2a4
Component: engine
2013-06-25 08:26:41 -04:00
3bc1ecc1fa
Merge pull request #992 from unclejack/use_numeric_owner_for_tar
...
* Runtime: use --numeric-owner for Tar and Untar
Upstream-commit: ec1dfc521ce9aa78f7635932708c798f87aa9374
Component: engine
2013-06-24 18:40:43 -07:00
51f8e07a39
Implement regression test for stdin attach
...
Upstream-commit: 5190f7f33a9e36f1f5991a385f4db198e9f1b3a6
Component: engine
2013-06-24 18:36:04 -07:00
38132ab186
Make NewDockerCli handle terminal
...
Upstream-commit: 873a5aa8e72102a31f34c62603a3f5976471e94a
Component: engine
2013-06-24 18:29:08 -07:00
9e3102fd11
Make term function consistent with each other
...
Upstream-commit: 672d3a6c6cd0494a0b8eaa13674c3cb87cba029c
Component: engine
2013-06-24 18:27:57 -07:00
40e51bbd8c
Make DockerCli use its own stdin/out/err instead of the os.Std*
...
Upstream-commit: a749fb21309b147a1bb9da0838f591ba58f6d169
Component: engine
2013-06-24 18:27:57 -07:00
1553a048ac
Fix issue when attaching stdin alone
...
Upstream-commit: 25d1bc2c09e3f6e7973d6b159e49ae7f8bd7670d
Component: engine
2013-06-24 18:27:57 -07:00
4d3023b64d
Testing|hack, issue #1009 : Update make kack environment
...
Upstream-commit: cc63c1b584a06a41482bf967908bab10853799f6
Component: engine
2013-06-24 15:01:51 -07:00
00aa741c14
Merge pull request #990 from dotcloud/fix-tests-cgo
...
* Hack: remove dependency of unit tests on 'os/user', which cannot be used with CGO_ENABLED=0
Upstream-commit: 145c622aba863ba64aa405c21cd21386189846b7
Component: engine
2013-06-24 12:31:54 -07:00
30b4c0d126
Merge pull request #932 from metalivedev/docs20130614
...
+ Documentation: Add terminology section
Upstream-commit: e2516c01b46ec41dc5dc3bce09f1e35fe3f7277b
Component: engine
2013-06-24 10:39:25 -07:00
4770325fb2
Merge pull request #1003 from dotcloud/fix_utils_tests
...
fix regression in utils tests introduced by #980
Upstream-commit: a3cb18d0f058df47fd4822508a53c0bb7d1af3d4
Component: engine
2013-06-24 09:14:13 -07:00
ab69a9cf4c
fix regrettion in utils tests introduced by #980
...
Upstream-commit: eca9f9c1a1e436167eb660ad700f3f9f5189bae4
Component: engine
2013-06-24 16:12:39 +00:00
cdfb5a925c
Merge pull request #998 from dotcloud/861-hack-vagrant
...
Fixing hack/Vagrantfile to use uname for aufs linux extras
Upstream-commit: aee845682f2f1be0044c82ea25916a9ff6a67649
Component: engine
2013-06-22 20:10:00 -07:00
15db0f8740
Fixing hack/Vagrantfile to use uname for aufs linux extras
...
Conflicts: hack/Vagrantfile
Resolved by: Daniel Mizyrycki <daniel@dotcloud.com >
Upstream-commit: e3dbe2f2ba56c2dc482f8fbdd0db0556bbc253c9
Component: engine
2013-06-22 19:58:33 -07:00
25d835a6cd
Merge pull request #997 from dotcloud/bump_0.4.6
...
Bump version to 0.4.6
Upstream-commit: 193888a2b4ad1e57593c530fa8381c38e7f42742
Component: engine
2013-06-22 13:41:48 -07:00
58d29f2b8c
Bump version to 0.4.6
...
Upstream-commit: 9fe8bfb2bc4b00a69db16e04e45c065090d1af2d
Component: engine
2013-06-22 13:36:45 -07:00
8abdf9e9cb
Merge pull request #996 from dotcloud/995-volumes-crash
...
- Runtime: fix a bug which caused creation of empty images (and volumes) to crash.
Upstream-commit: fc25973371b3770d9daf00b051b9715d6b63a2c0
Component: engine
2013-06-22 13:35:26 -07:00
ebda9dc688
- Runtime: add regression test for issue #995
...
Upstream-commit: f9acd605dcd48037d61c4f5cd114bca41e147b9e
Component: engine
2013-06-22 13:33:43 -07:00
692004c87b
Fix a bug which caused creation of empty images (and volumes) to crash. FIxes #995 .
...
Upstream-commit: 290b1973a90e39f2b7f751f038633b9e6e4a1694
Component: engine
2013-06-22 12:29:42 -07:00
0a0958e06f
use --numeric-owner for tar and untar
...
Upstream-commit: d7d42ff4feab59ca6566addc20926a27aeaba8ef
Component: engine
2013-06-22 18:53:10 +03:00
d6968c304b
Remove dependency on 'os/user', which cannot be used with CGO_ENABLED=0. This allows running the tests without CGO.
...
Upstream-commit: ce9e50f4eeed9ec9d715d805ae6706ed6f28da3b
Component: engine
2013-06-21 19:40:42 -07:00
487534c5cb
Fix formatting in Changelog
...
Upstream-commit: ecd1fff9b001a0379d06d0d115da5106c66056e7
Component: engine
2013-06-21 20:22:14 -06:00
bad2357f84
Merge pull request #988 from dotcloud/526-packaging-ubuntu
...
Packaging|Ubuntu, issue #526 : Follow init permission pattern for docker.conf
Upstream-commit: b0f12bd5e8381e207bac148f161ced4a04218361
Component: engine
2013-06-21 18:03:12 -07:00
84fd5a5a9e
Packaging|Ubuntu, issue #526 : Follow init permission pattern for docker.conf
...
Upstream-commit: 5d61ec11e35f22f6e89f24b5186c7697cb187165
Component: engine
2013-06-21 17:57:45 -07:00
9532506c90
Merge pull request #986 from dotcloud/bump_0.4.5
...
Bump version to 0.4.5
Upstream-commit: c792c0a6c9e110c082e61022cd53b725f150b410
Component: engine
2013-06-21 17:13:38 -07:00
a02500ec05
Small copy improvements in Changelog
...
Upstream-commit: d9d2540162a79e08d9bc84b16b6e9a91ea91d56e
Component: engine
2013-06-21 17:09:49 -07:00
ddee279309
Bump version to 0.4.5
...
Upstream-commit: f5d08fc49c48cda7fdce613a1cef57ed2b105abd
Component: engine
2013-06-21 17:01:01 -07:00
5b6afd3aa9
Merge pull request #959 from dotcloud/947-add_ps_size_option
...
+ Client: Add docker ps -s option to display containers' sizes
Upstream-commit: b24759af1cae17963779ec15c70f5b45ddaf904d
Component: engine
2013-06-21 16:10:45 -07:00
3f92ee019d
merge master and add doc
...
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
