1
0
mirror of https://github.com/docker/cli.git synced 2026-01-28 04:20:55 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
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
Guillaume J. Charmes
539c6ff974 Merge branch 'master' into improve_progressbar_pull
Upstream-commit: 60fd7d686dea6645ab61c27d0132d38c07a89e80
Component: engine
2013-06-14 12:01:40 -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
de943396cb Merge pull request #868 from dotcloud/postupload-endpoints-header
- Registry: Send X-Docker-Endpoints at the end of a push
Upstream-commit: 05b87d2d5b87c606818f5dcc10e466a355cf1630
Component: engine
2013-06-14 11:53:54 -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
2a4a4027de update docs, remove config file on 401
Upstream-commit: 90f6bdd6e41ec352009ffbd073c1f45983abb74b
Component: engine
2013-06-14 13:38:51 +00: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
Victor Vieux
048352879c fix auth in case you change your password on index.io
Upstream-commit: 9cc72ff1a9632736adc7dd12f096e3233896fced
Component: engine
2013-06-14 09:53:48 +00:00
Daniel Mizyrycki
9eee7b53cc Packaging, dockerbuilder: Automate pushing docker binary packages
Upstream-commit: 3384943cd3bc5bb9fd79ccbda9d32a582ada69b3
Component: engine
2013-06-13 22:14:43 -07:00
Guillaume J. Charmes
d4a6b05778 Add build UT
Upstream-commit: 2f14dae83f23f62085015243a74df4ffc415c6c4
Component: engine
2013-06-13 18:52:41 -07:00
Guillaume J. Charmes
57ce6972e0 Fix issue with ADD
Upstream-commit: f03ebc20aa33dbb9b468fe476ce26467eb328060
Component: engine
2013-06-13 18:42:27 -07:00
Guillaume J. Charmes
18df81b8e1 Merge branch 'master' into builder_server-3
Conflicts:
	buildfile.go
	commands.go
	docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine
2013-06-13 18:11:22 -07: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
30e88c1b6c Remove run from non-running commmands
Upstream-commit: f5fe3ce34e12f1660ee98cecdbe2c104567d88a6
Component: engine
2013-06-13 15:08:53 -07:00
Guillaume J. Charmes
cac3a28159 Remove run from the ADD instruction
Upstream-commit: d0084ce5f23453fbc008f5a2c5dd147b0df890e7
Component: engine
2013-06-13 14:57:50 -07:00
Guillaume J. Charmes
bc53b19305 Fix non-tty run issue
Upstream-commit: 2eaa0a1dd7354e429c056d68515f903351e3eeb4
Component: engine
2013-06-13 12:57:35 -07:00
Guillaume J. Charmes
77afac0ce2 Merge pull request #751 from dotcloud/660-auth_client-feature
* Registry: Move auth to the client
Upstream-commit: 80857545076ade871eff7fc76c2fe83554219e3f
Component: engine
2013-06-13 11:52:40 -07:00
Victor Vieux
4147a474f5 rebase master
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
Guillaume J. Charmes
5f7f6d9927 Updated build usage
Upstream-commit: b38c6929be500336de6f6a5f7a52d73cbf543fb6
Component: engine
2013-06-13 10:50:55 -07: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
Guillaume J. Charmes
1713770a58 Merge pull request #799 from dotcloud/691-run_id-feature
* Runtime: allow docker run <name>:<id>
Upstream-commit: 30fb45c494b957682c072c222245d5b7623f1ede
Component: engine
2013-06-13 10:14:40 -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