Solomon Hykes
549a47a3dd
Remove bsdtar dependency in various install scripts
...
Upstream-commit: 6f511ac29b1c3cf1c2424b3c39ee14a32aecb5d7
Component: engine
2013-06-18 10:23:45 -07:00
Guillaume J. Charmes
b0870dd8c5
Fix bug on compression detection when chunck < 10bytes
...
Upstream-commit: 02c291d13be261f84cdfa1d51513bf4dba31ce72
Component: engine
2013-06-17 18:11:58 -07:00
Guillaume J. Charmes
d233a440c6
Merge branch 'master' into remove_bsdtar
...
Conflicts:
docs/sources/contributing/devenvironment.rst
Upstream-commit: abf85b25085b52e19f774dc30bd87527b3295f2a
Component: engine
2013-06-14 14:34:30 -07:00
Guillaume J. Charmes
43010d8df6
Merge pull request #892 from unclejack/validate_memory_limits
...
* Runtime: validate memory limits & error out if it's less than 524288
Upstream-commit: 813771e6b79bb40d72895ec6f95cb7aa61b193fe
Component: engine
2013-06-14 14:32:28 -07:00
unclejack
f884195c28
add test: fail to create container if mem limit < 512KB
...
Upstream-commit: d3f83a6592e3d79768d9d3805edec80642b69c4b
Component: engine
2013-06-14 22:55:00 +03:00
Andy Rothfusz
4bc27f700a
Add examples for local import.
...
Upstream-commit: 7958f1f694ac411dcfeb8fbf0d702a7c552306ae
Component: engine
2013-06-14 13:42:59 -06:00
Guillaume J. Charmes
71762e1ba0
Merge pull request #816 from unclejack/524-fix_aufs_links_related_warnings
...
524 fix aufs links related warnings
Upstream-commit: 4a02c6dab1c3ba798370a64baa8bd94fa6f89c11
Component: engine
2013-06-14 12:32:47 -07:00
Guillaume J. Charmes
129ce7e2e2
Merge pull request #663 from dotcloud/662-fix_push_html_404-fix
...
* Registry: add regexp check on repo's name
Upstream-commit: 165d343d0688ac396269a07a97a6ffc25472133c
Component: engine
2013-06-14 12:30:44 -07:00
Solomon Hykes
5026ebfb0a
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: c701de939f645030b36f2f89acbbcf30979fe5be
Component: engine
2013-06-14 11:58:46 -07:00
Guillaume J. Charmes
600eb1d103
Merge branch 'master' into postupload-endpoints-header
...
Conflicts:
server.go
Upstream-commit: 78e4a385f77c33933afc47c8b3f4436ce648eb54
Component: engine
2013-06-14 11:50:58 -07:00
unclejack
25419889e5
install aufs-tools when setting up the testing vagrant box
...
Upstream-commit: 822abab17e33a0f87ef1d785a9148d3ea11cbb60
Component: engine
2013-06-14 21:41:12 +03:00
unclejack
9b310a0f72
install aufs-tools when setting up the hack vagrant box
...
Upstream-commit: f1d16ea0035ee45341e5d4a143cdce5798847cb5
Component: engine
2013-06-14 21:41:12 +03:00
unclejack
1d89b8f78f
add aufs-tools package to dev env docs page
...
Upstream-commit: fb7eaf67d1c01eea28fcbed61d6d8abd8117c965
Component: engine
2013-06-14 21:41:12 +03:00
unclejack
1ee51a2d56
add aufs-tools to lxc-docker dependencies
...
Upstream-commit: e53721ef69b13365c18c9189145ae1fadb931f01
Component: engine
2013-06-14 21:38:15 +03:00
unclejack
5f39923376
run auplink before unmounting aufs
...
Upstream-commit: 2f67a62b5b48862948b1ce92aeffbb83c3707ee0
Component: engine
2013-06-14 21:38:15 +03:00
Guillaume J. Charmes
f73437e29d
Update docs
...
Upstream-commit: 79fe864d9a117193b4dce8b7fe156a55bbadcce6
Component: engine
2013-06-14 10:58:16 -07:00
Guillaume J. Charmes
c803fc1f04
Add unit tests for tar/untar with multiple compression + detection
...
Upstream-commit: 6f7de49aa8771ef4bc35548f9aa07fee660f1844
Component: engine
2013-06-14 10:47:49 -07:00
unclejack
d7771969bf
validate memory limits & error out if less than 512 KB
...
Upstream-commit: 9ee11161bf0c635a0b0164ae1dee806c6fcfe7b7
Component: engine
2013-06-14 19:52:44 +03:00
Victor Vieux
b78bf5bb71
update docs
...
Upstream-commit: e49f82b9e1a920c902c1cd813596dc1a78817e63
Component: engine
2013-06-14 10:10:26 +00:00
Victor Vieux
730a1370b2
Merge branch 'master' into 22-add_sizes_images_and_containers-feature
...
Upstream-commit: ddf5a1940fdbe2efa7136e7f5f26c2adc1a59b3e
Component: engine
2013-06-14 10:05:06 +00:00
Victor Vieux
5bf955bfcc
fix virtual size on images
...
Upstream-commit: 00cf2a1fa264c167dff0dd50e296c93d4c59908f
Component: engine
2013-06-14 10:05:01 +00:00
Guillaume J. Charmes
a22d73d8b0
Remove bsdtar by checking magic
...
Upstream-commit: 0425f65e6373dc38cd18a6d0f2a50671544ad4b2
Component: engine
2013-06-13 17:53:38 -07:00
Guillaume J. Charmes
c822b87ed3
Remove run() where it is not needed within the builder
...
Upstream-commit: 452128f0daf8117502fad2fe2f72b6f022223ddb
Component: engine
2013-06-13 15:18:15 -07:00
Guillaume J. Charmes
bc53b19305
Fix non-tty run issue
...
Upstream-commit: 2eaa0a1dd7354e429c056d68515f903351e3eeb4
Component: engine
2013-06-13 12:57:35 -07:00
Victor Vieux
4147a474f5
rebase master
...
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
Guillaume J. Charmes
87329359a3
Fix merge issue
...
Upstream-commit: 42d1c36a5c775a37a0173cf315086fde1c1b7dd8
Component: engine
2013-06-13 10:25:43 -07:00
Guillaume J. Charmes
ead98e2ea5
Merge pull request #883 from unclejack/build-docker-with-go1.1.1
...
use Go 1.1.1 to build docker
Upstream-commit: 51a4b6510141ec3a0095a0ab9f3510eb47084457
Component: engine
2013-06-13 10:20:38 -07:00
Victor Vieux
fc1bee82c0
Merge branch 'master' into 691-run_id-feature
...
Upstream-commit: 9cdd39e0d76079206cc1befe222e2205128e5ed0
Component: engine
2013-06-13 13:18:43 +00:00
Victor Vieux
00bcb3e136
added test
...
Upstream-commit: 45a8945746a205ea513efc17bb242c63362c79a9
Component: engine
2013-06-13 13:17:56 +00:00
Victor Vieux
d307a95564
Merge pull request #804 from dotcloud/no_stdout_stale-fix
...
*Runtime: Fix stale command when stdout is not allocated
Upstream-commit: 697282d6ada16b53c013515117038f8f391e87f7
Component: engine
2013-06-13 04:22:29 -07:00
unclejack
37bffa0b82
use Go 1.1.1 to build docker
...
Upstream-commit: 78a76ad50eaf9d5a99336a47b2b78f547fa8a972
Component: engine
2013-06-13 08:59:41 +03:00
Solomon Hykes
9efccead8d
Merge branch '610-improve_rmi-feature'
...
* Runtime: improved image removal to garbage-collect unreferenced parents
- Runtime: fixed image removal to cleanly remove tags and repositories
Upstream-commit: 5ecfe13be9f8f47e27e5134e60d14d195a1baeaa
Component: engine
2013-06-12 20:30:07 -07:00
Guillaume J. Charmes
9fca9d3398
Merge pull request #826 from dotcloud/825-move_xino_shm-fix
...
- Runtime: fix aufs mount on ubuntu13.04+btrfs
Upstream-commit: 0bc1c6d57a539e9620d3ee8c7f6c5689469a2bdf
Component: engine
2013-06-12 17:20:42 -07:00
Solomon Hykes
b912343e0e
FIXME: a loose collection of FIXMEs for internal use by the maintainers
...
Upstream-commit: f57175cbadbe7d8f48bfd5e3594116913de6e3ab
Component: engine
2013-06-12 15:28:59 -07:00
Sam Alba
c492485451
Update NOTICE
...
Upstream-commit: 81a11a3c30d01040451898f0e88a19363568edc3
Component: engine
2013-06-12 15:50:30 -06:00
Sam Alba
a4cf232a08
Update README.md
...
Upstream-commit: 04cca097ae9f7a8f64dbea1e12f3b871f6a67d65
Component: engine
2013-06-12 15:50:09 -06:00
Andy Rothfusz
3f42298556
Merge pull request #845 from unclejack/841-update_docs_no_add_without_context
...
841 - docs: warn about the transmission of data to the docker daemon & ADD without context
Upstream-commit: 48897b5fa1e1cae157e484a465a696520f9106d3
Component: engine
2013-06-12 14:25:44 -07:00
Solomon Hykes
c2ddd27195
New roadmap item: advanced port redirections
...
Upstream-commit: ecae342434aeccb05b3cffe30c34051d84afdb74
Component: engine
2013-06-12 10:50:47 -07:00
Victor Vieux
0a236e493a
bump to master
...
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
Solomon Hykes
3ff2998841
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: b4565af25657aa28d1cc9c740c82700c5ec6ce8b
Component: engine
2013-06-12 10:23:14 -07:00
Guillaume J. Charmes
4673596391
Merge pull request #844 from dotcloud/843-inspect_multiple_params-feature
...
* Runtime: allow multiple params in inspect
Upstream-commit: c85e775162f8b021ddec21ee1181295344d760fb
Component: engine
2013-06-12 10:18:42 -07:00
Guillaume J. Charmes
768878b42d
Merge pull request #852 from dotcloud/556-docker-search-fmt
...
Remove CR/NL from description in docker CLI
Upstream-commit: 3491df6edbfba44d655e3ffec98d1c232b738b71
Component: engine
2013-06-12 10:17:05 -07:00
Guillaume J. Charmes
78bdfed64f
Merge pull request #874 from fsouza/fix-build-newline
...
- Builder: don't ignore last line in Dockerfile when it doesn't end with \n
Upstream-commit: 0e6ec57996c942473fce1c187c022d5bd9517a1f
Component: engine
2013-06-12 10:15:00 -07:00
Francisco Souza
786796c894
commands: use in instead of os.Stdin in hijack
...
Upstream-commit: da54abaf2e86e530d0096e0f85b64b6cc17fcbe0
Component: engine
2013-06-12 09:54:37 -03:00
Solomon Hykes
2ebddf1907
Merge pull request #853 from kencochrane/registry-api-1.1-fix
...
* Documentation: separate the registry and index API's into their own docs
Upstream-commit: 092c761cec2e89f73c3810ff8f2f4ffb01db53b0
Component: engine
2013-06-11 18:34:10 -07:00
Solomon Hykes
80a88f5958
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 5edafd62846045c6e5ad85b2a38aaa2defad91da
Component: engine
2013-06-11 11:21:57 -07:00
Solomon Hykes
040fa0beff
Added a readme explaining the role of each API
...
Upstream-commit: d64f105b44d202aeb83a5f4edbdffdf2375992fa
Component: engine
2013-06-11 10:39:02 -07:00
Victor Vieux
1845dad9af
Merge pull request #864 from dotcloud/851-choose_public_port-feature
...
* Runtime: you can now specify public port (ex: -p 80:4500)
Upstream-commit: 2d5eda5141f62e578376f4f007c53fc7c1a54983
Component: engine
2013-06-11 10:11:10 -07:00
Solomon Hykes
bd3bf082e2
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: be15d5f2d916d1ea55a7c8d2288fb77a766afaec
Component: engine
2013-06-11 10:09:34 -07:00
Solomon Hykes
a2c3983005
More principles. Raw and unstructured to spawn discussion.
...
Upstream-commit: 5918a5a3228442cdf55bed6591090c00ebb1357c
Component: engine
2013-06-11 09:27:36 -07:00