Commit Graph

20395 Commits

Author SHA1 Message Date
2a4a4027de update docs, remove config file on 401
Upstream-commit: 90f6bdd6e41ec352009ffbd073c1f45983abb74b
Component: engine
2013-06-14 13:38:51 +00:00
b78bf5bb71 update docs
Upstream-commit: e49f82b9e1a920c902c1cd813596dc1a78817e63
Component: engine
2013-06-14 10:10:26 +00:00
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
5bf955bfcc fix virtual size on images
Upstream-commit: 00cf2a1fa264c167dff0dd50e296c93d4c59908f
Component: engine
2013-06-14 10:05:01 +00:00
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
9eee7b53cc Packaging, dockerbuilder: Automate pushing docker binary packages
Upstream-commit: 3384943cd3bc5bb9fd79ccbda9d32a582ada69b3
Component: engine
2013-06-13 22:14:43 -07:00
d4a6b05778 Add build UT
Upstream-commit: 2f14dae83f23f62085015243a74df4ffc415c6c4
Component: engine
2013-06-13 18:52:41 -07:00
57ce6972e0 Fix issue with ADD
Upstream-commit: f03ebc20aa33dbb9b468fe476ce26467eb328060
Component: engine
2013-06-13 18:42:27 -07:00
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
a22d73d8b0 Remove bsdtar by checking magic
Upstream-commit: 0425f65e6373dc38cd18a6d0f2a50671544ad4b2
Component: engine
2013-06-13 17:53:38 -07:00
c822b87ed3 Remove run() where it is not needed within the builder
Upstream-commit: 452128f0daf8117502fad2fe2f72b6f022223ddb
Component: engine
2013-06-13 15:18:15 -07:00
30e88c1b6c Remove run from non-running commmands
Upstream-commit: f5fe3ce34e12f1660ee98cecdbe2c104567d88a6
Component: engine
2013-06-13 15:08:53 -07:00
cac3a28159 Remove run from the ADD instruction
Upstream-commit: d0084ce5f23453fbc008f5a2c5dd147b0df890e7
Component: engine
2013-06-13 14:57:50 -07:00
bc53b19305 Fix non-tty run issue
Upstream-commit: 2eaa0a1dd7354e429c056d68515f903351e3eeb4
Component: engine
2013-06-13 12:57:35 -07:00
4147a474f5 rebase master
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
5f7f6d9927 Updated build usage
Upstream-commit: b38c6929be500336de6f6a5f7a52d73cbf543fb6
Component: engine
2013-06-13 10:50:55 -07:00
87329359a3 Fix merge issue
Upstream-commit: 42d1c36a5c775a37a0173cf315086fde1c1b7dd8
Component: engine
2013-06-13 10:25:43 -07:00
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
fc1bee82c0 Merge branch 'master' into 691-run_id-feature
Upstream-commit: 9cdd39e0d76079206cc1befe222e2205128e5ed0
Component: engine
2013-06-13 13:18:43 +00:00
00bcb3e136 added test
Upstream-commit: 45a8945746a205ea513efc17bb242c63362c79a9
Component: engine
2013-06-13 13:17:56 +00:00
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
37bffa0b82 use Go 1.1.1 to build docker
Upstream-commit: 78a76ad50eaf9d5a99336a47b2b78f547fa8a972
Component: engine
2013-06-13 08:59:41 +03:00
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
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
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
c492485451 Update NOTICE
Upstream-commit: 81a11a3c30d01040451898f0e88a19363568edc3
Component: engine
2013-06-12 15:50:30 -06:00
a4cf232a08 Update README.md
Upstream-commit: 04cca097ae9f7a8f64dbea1e12f3b871f6a67d65
Component: engine
2013-06-12 15:50:09 -06:00
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
c2ddd27195 New roadmap item: advanced port redirections
Upstream-commit: ecae342434aeccb05b3cffe30c34051d84afdb74
Component: engine
2013-06-12 10:50:47 -07:00
0a236e493a bump to master
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
3ff2998841 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: b4565af25657aa28d1cc9c740c82700c5ec6ce8b
Component: engine
2013-06-12 10:23:14 -07:00
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
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
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
786796c894 commands: use in instead of os.Stdin in hijack
Upstream-commit: da54abaf2e86e530d0096e0f85b64b6cc17fcbe0
Component: engine
2013-06-12 09:54:37 -03:00
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
80a88f5958 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 5edafd62846045c6e5ad85b2a38aaa2defad91da
Component: engine
2013-06-11 11:21:57 -07:00
040fa0beff Added a readme explaining the role of each API
Upstream-commit: d64f105b44d202aeb83a5f4edbdffdf2375992fa
Component: engine
2013-06-11 10:39:02 -07:00
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
bd3bf082e2 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: be15d5f2d916d1ea55a7c8d2288fb77a766afaec
Component: engine
2013-06-11 10:09:34 -07:00
a2c3983005 More principles. Raw and unstructured to spawn discussion.
Upstream-commit: 5918a5a3228442cdf55bed6591090c00ebb1357c
Component: engine
2013-06-11 09:27:36 -07:00
0117018182 Merge pull request #865 from dotcloud/errors_commands-fix
Display StatusText as error when empty body in commands.go
Upstream-commit: f8af296e6f8c10cb6740dd054f1538f318640f0f
Component: engine
2013-06-11 09:16:54 -07:00
7b13257108 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 432e18990b1cfbae014ff41c5445658a8d410aeb
Component: engine
2013-06-11 08:58:23 -07:00
18e0ba9ccf build: don't ignore last line in Dockerfile when it doesn't end with \n
Upstream-commit: 2e9403b047d926d39d5b299abc071f3c29627fc6
Component: engine
2013-06-11 11:39:06 -03:00
2bb72522f6 add Michael Crosby to AUTHORS
Upstream-commit: 3ea6a2c7c39695fbfe3dfe228db00335c9937c14
Component: engine
2013-06-11 10:17:39 +00:00
604adb2ef8 * Remote Api: Add flag to enable cross domain requests
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
6315b0d212 Add OPTIONS to route map
Move the OPTIONS method registration into the existing
route map.  Also add support for empty paths in
the map.
Upstream-commit: dd53c457d75a49e6e140c6d71642b237f3ee9056
Component: engine
2013-06-10 16:10:40 -09:00
2d226181f9 Add explicit status response to OPTIONS handler
Write the http.StatusOK header in the OPTIONS
handler and update the unit tests to refer to the
response code using the const from the http package.
Upstream-commit: ac599d652846f6456366b8028b2c38da0565d8b1
Component: engine
2013-06-10 14:44:10 -09:00
ec363b1d2d Add links to libraries, fix #800
Upstream-commit: ca4597e9d74474e4211cee9bf48513643a28fdf9
Component: engine
2013-06-10 15:22:34 -07:00
b4019d7d98 Add list of Docker Remote API Client Libraries. Fixes #800.
Upstream-commit: eeea9ac9468a73bb9514a2d729060889b48384ee
Component: engine
2013-06-10 15:17:27 -07:00