Commit Graph

2173 Commits

Author SHA1 Message Date
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
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
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
b45a456a15 consistent codebase fix
Upstream-commit: 1581ed52ba07a869b5902afbb7c7bb01bb1e4a63
Component: engine
2013-06-21 22:55:33 +00:00
9d597b11de Merge pull request #848 from dotcloud/builder_server-3
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
7ab6c2d54d Remove deprecated INSERT from documentation
Upstream-commit: 169ef21de768a45805f2afc56b3e5c6f21130b92
Component: engine
2013-06-21 14:12:52 -07:00
b6d1924c7d Update api docs
Upstream-commit: d0fa6927f8ad87e73a02f64ae9d6db6a820c1f4c
Component: engine
2013-06-21 13:51:48 -07:00
965a3d343a Merge pull request #970 from titanous/go1.1-unreachable
Remove code unreachable using Go 1.1
Upstream-commit: 63e8a4ac7441ac4af5ca8fdf05f44e9a8a7fc623
Component: engine
2013-06-21 10:44:40 -07:00
78880cab1c Merge pull request #980 from ToothlessGear/fix-progressbar
* Client: fix progressbar output
Upstream-commit: 459230d3f9db142b19c44a680a71c23dcc65aca4
Component: engine
2013-06-21 10:42:14 -07:00
58b777a3ce Merge pull request #975 from unclejack/891-mark_command_as_optional
891 mark command as optional for docker run
Upstream-commit: 070e1aec7e1e308409dfd9132034ae4101d52977
Component: engine
2013-06-21 10:22:52 -07:00
f0b6132493 Client: better progressbar output
Upstream-commit: 3ac68f1966222d9a1c0ff867515e3f5c2f83e422
Component: engine
2013-06-21 17:19:27 +02:00
162b88e0bd Merge pull request #801 from dotcloud/build_docker_static
* Makefile: Add link flags in order to link statically and without debug symbols
Upstream-commit: 5ccde4dffc836fb0c6ea967d5d61920edfb65bd0
Component: engine
2013-06-21 02:30:57 -07:00
eb8ac2846d Merge pull request #888 from dotcloud/fix-auth
* Auth: fix auth small issue in case you change your password on index.io
Upstream-commit: dc847001a5f17668347052a5146edc4ed3fe8c68
Component: engine
2013-06-21 02:22:01 -07:00