Commit Graph
2682 Commits
Author SHA1 Message Date
Marco Hennings 553b7563ec Pushing an Image causes the docker client to give an error message instead of
writing out streamed status.

This is caused by a Buffering message that is not in the correct json format:

[...]
{"status"
:"Pushing 6bba11a28f1ca247de9a47071355ce5923a45b8fea3182389f992f4
24b93edae"}Buffering to disk 244/? (n/a)..
{"status":"Pushing",[...]

The "Buffering to disk" message is originated in
srv.runtime.graph.TempLayerArchive

I am now using the StreamFormatter provided by the context from which the
method is called.
Upstream-commit: 1e2ef274cdaa76e79435df52cdc196739ba8b3b1
Component: engine
2013-07-04 10:50:37 +02:00
Guillaume J. Charmes c61eaae7b1 Merge pull request #1111 from cespare/style-fixes
Style fixes
Upstream-commit: bcb5e36dd9ed3054c5efad0aa9a9904dcd497338
Component: engine
2013-07-03 14:46:05 -07:00
Caleb Spare 1c71d0a65e Implement several golint suggestions, including:
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
Upstream-commit: 19121c16d9514b391ce8f15aeff3c47c1ea5a841
Component: engine
2013-07-03 14:36:04 -07:00
Caleb Spare 36eac88873 Simplify the NopWriter code.
Upstream-commit: 27ee261e6048c6fa0334bcce2116610dcd04aaed
Component: engine
2013-07-03 14:35:18 -07:00
Caleb Spare f4980e7dfe Gofmt -s (simplify)
Upstream-commit: da3962266a4103f2dbf019180585d206fb9e25ff
Component: engine
2013-07-03 14:35:18 -07:00
Caleb Spare e510808505 Use fmt.Errorf when appropriate.
Upstream-commit: e93afcdd2bd9578f98508aaad11b695dae29726e
Component: engine
2013-07-03 14:35:18 -07:00
Caleb Spare 03f2d7e4a6 Typo correction: Excepted -> Expected'
Upstream-commit: dd1b9e38e95dc719a7aeadbdee67a5f3a4873dec
Component: engine
2013-07-03 14:35:18 -07:00
Guillaume J. Charmes e37fa79f37 Merge pull request #1112 from cespare/mutex-style
Mutex style change.
Upstream-commit: 96bc9ea7c113127673e6e47a0366311e1edb8f1a
Component: engine
2013-07-03 10:34:32 -07:00
Guillaume J. Charmes ce8c962683 Merge pull request #1053 from dynport/do-not-copy-hostname-from-image
do not merge hostname from image
Upstream-commit: 16c8a10ef969fd9c87a96df69807b2928cd669de
Component: engine
2013-07-03 10:34:15 -07:00
Victor Vieux 2394c9c8dc add last version
Upstream-commit: 64450ae3f89b8f9b5288224c5a7d109a166cf22a
Component: engine
2013-07-03 17:11:00 +00:00
Joffrey F 3022226088 Merge pull request #1109 from dynport/remote-lookup-fix
Fix remote lookup when pushing into registry
Upstream-commit: 5dcd11be16f732f68199b9ee96ce76190b64a9aa
Component: engine
2013-07-03 06:29:19 -07:00
Ken Cochrane bb648657e1 Merge pull request #1113 from metalivedev/docs20130702
* Documentation: fix broken link on the documentation index page
Upstream-commit: dc91a7b6411801f03a17b253fe8500da106112f7
Component: engine
2013-07-03 05:52:25 -07:00
Andy Rothfusz 7033d58dca Fix installation link from welcome page.
Upstream-commit: 11998ae7d62ee17856ead81ce49409dc63643d62
Component: engine
2013-07-02 16:48:57 -07:00
Caleb Spare 8f5746f4d9 Mutex style change.
For structs protected by a single mutex, embed the mutex for more
concise usage.

Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
Upstream-commit: 1cf9c80e976fb60b4d5d489cd1c4c9959bcc4f7f
Component: engine
2013-07-02 15:53:08 -07:00
Andy Rothfusz a2abd325b9 Merge pull request #1095 from metalivedev/docs20130627
Docs and images updates
Upstream-commit: 6dbcdd3ed5ae87dcb175431a1ad3e6c989ada2a5
Component: engine
2013-07-02 15:13:31 -07:00
Tobias Schwab cad00c9d8a fix two obvious bugs???
Upstream-commit: 9632cf09bfd7b4a8513799bf19070ecabd55c446
Component: engine
2013-07-02 22:11:03 +00:00
Andy Rothfusz d5551edef2 Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
Conflicts:
	docs/sources/concepts/manifesto.rst
	docs/sources/index.rst
Upstream-commit: 96ab3c540d5f9f8509380f50e790b184beb2be6b
Component: engine
2013-07-02 15:10:07 -07:00
Andy Rothfusz 92fbe05ddb Cleaning up the welcome page, terminology, and images.
Upstream-commit: ff964d327d030221b4e65661cee0ee0826bcdb32
Component: engine
2013-07-02 15:03:29 -07:00
Andy Rothfusz 4deb63608f Fix broken quickstart link
Upstream-commit: 4b8688f1e5a5998e10bdc1d7b39458a611a25eef
Component: engine
2013-07-02 14:10:06 -07:00
Andy Rothfusz b8221b0ce7 Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
Conflicts:
	docs/sources/concepts/manifesto.rst
Upstream-commit: 55b5889a0fa74db30e6a07f84b02e22ea41c3e19
Component: engine
2013-07-02 13:00:08 -07:00
Andy Rothfusz ad16b4b27c Shortened lines to 80 columns
Upstream-commit: dd4c6f6a09c98f075fc5964242792d9e9f2c20d4
Component: engine
2013-07-02 12:09:57 -07:00
Andy Rothfusz df5dac21e6 Clean up image text, minor updates to docs.
Upstream-commit: 6058261a26b9e23926612fddfd8ad37bfcf1dd9c
Component: engine
2013-07-02 12:09:57 -07:00
Andy Rothfusz 09eb5cc9ff Adding files for terms
Upstream-commit: b461e4607de497096b0ec92bb05d5a88bfe0e48d
Component: engine
2013-07-02 12:09:57 -07:00
Andy Rothfusz 66a935418f Cleaning up the welcome page, terminology.
Upstream-commit: d399f720983d94706bdaae528a2637778ca5b5e0
Component: engine
2013-07-02 12:09:57 -07:00
Guillaume J. Charmes 831c6f9959 Merge pull request #1107 from eliasp/issue-1020
* Runtime: Don't remove the container= environment variable.
Upstream-commit: c9e1c65c640a1ad951586fe8e41f9f1658244f04
Component: engine
2013-07-02 11:42:44 -07:00
Victor Vieux 805a9b9625 never remove the file and try to load it in start
Upstream-commit: 3042f11666a38ea6b1da206de372bf85463db945
Component: engine
2013-07-02 18:02:16 +00:00
Elias Probst f94dc93764 Don't remove the container= environment variable, as it is crucial for a lot of tools to detect, whether they're run inside an LXC container or not.
Upstream-commit: e5e47c98629f9e81ea24d2784e04863d614d34f5
Component: engine
2013-07-02 19:13:37 +02:00
Victor Vieux a189f7d618 Merge pull request #1103 from shin-/1060-pull-only-tagged-images
*Registry: When no tag is specified in docker pull, skip images that are not tagged
Upstream-commit: 1c5083315d1fbee703854bfa336f4aa1b42e5014
Component: engine
2013-07-02 10:08:21 -07:00
Victor Vieux c6f9d1d947 change file location
Upstream-commit: 27a137ccab5990721298cf58aee588ca9b4200ff
Component: engine
2013-07-02 17:02:42 +00:00
shin- 9389c940d4 When no tag is specified in docker pull, skip images that are not tagged
Upstream-commit: 7cc294e777f8151061efa4a9da5f59d2f992473b
Component: engine
2013-07-02 18:25:06 +02:00
Daniel Mizyrycki 6695c179f1 Merge pull request #987 from dotcloud/601-packaging-ubuntu
Packaging|ubuntu, issue #601: Allow packaging prerm to do its job
Upstream-commit: a20dcfb04974f44d6fd2edd385ffdc03334fb2b3
Component: engine
2013-07-02 08:51:01 -07:00
Victor Vieux be9588204f store hostConfig to /tmp while container is running
Upstream-commit: 06b53e3fc7aca2b3dae32edab08c7662d3e9e7e8
Component: engine
2013-07-02 12:19:25 +00:00
Victor Vieux d6b3d1ae9e Merge pull request #1101 from dotcloud/fix-unit_tests
add sleep in tests and go fmt
Upstream-commit: 8f9dd861467613a081c4584eafadc60acbb7890f
Component: engine
2013-07-02 03:48:24 -07:00
Victor Vieux 438fda3245 add sleep in tests and go fmt
Upstream-commit: ebba0a60245b487e6d3d242f47c8999321ec5d29
Component: engine
2013-07-02 10:47:37 +00:00
Victor Vieux 8f4cd54500 Merge pull request #1099 from lopter/master
*Test :  Fix
Upstream-commit: c9236d99d2c98c6b72fa97f25d958a90faf6873c
Component: engine
2013-07-02 02:42:21 -07:00
Louis Opter 40f3d8b8b8 More unit test fixes
- Fix TestGetImagesJSON when there is more than one image in the test
  repository;
- Remove an hardcoded constant use in TestGetImagesByName;
- Wait in a loop in TestKillDifferentUser;
- Use env instead of /usr/bin/env in TestEnv;
- Create a daemon user in contrib/mkimage-unittest.sh.
Upstream-commit: f03c1b8eeb367beefa91046e2fa114af9a816aaa
Component: engine
2013-07-01 17:24:21 -07:00
Guillaume J. Charmes 9e73607525 Merge pull request #1097 from dotcloud/bump_0.4.8
Bump version to 0.4.8
Upstream-commit: 6f23e39e6b5dfa38b2263422371a5ed1cc8e4315
Component: engine
2013-07-01 17:13:19 -07:00
Solomon Hykes 44f9a36ca8 Rephrase changelog
Upstream-commit: fe0378e9b36b89d5eb01b4c2bf8c160305a958a7
Component: engine
2013-07-01 17:05:49 -07:00
Guillaume J. Charmes 8b7816d5d5 Bump version to 0.4.8
Upstream-commit: 96a1d7c6455b5b4326469f9a51bee869883aac3c
Component: engine
2013-07-01 16:58:25 -07:00
Guillaume J. Charmes f8f9a4db66 Merge pull request #1046 from dotcloud/1043-output_id_non_attach-fix
- Runtime: Make sure the ID is displayed usgin run -d
Upstream-commit: 79ee8b46f449aaa0770e16be6af5e1ea8b77a1cc
Component: engine
2013-07-01 16:49:43 -07:00
Victor Vieux 0a35df273e Merge pull request #1092 from lopter/master
Fix TestGetInfo when there is more than one image in the test repository
Upstream-commit: 55a7a8b8c972b9ff3bba583a2aa0dfe3d703e359
Component: engine
2013-07-01 16:41:01 -07:00
Andy Rothfusz de55ad0e3d Clean up image text, minor updates to docs.
Upstream-commit: b47873c5accd33964c33f718ceeda955d1a9a3c8
Component: engine
2013-07-01 16:37:13 -07:00
Andy Rothfusz c4bb1a9c18 Adding files for terms
Upstream-commit: adf75d402ab428a16ac3d57d0154ddd02be2fb6b
Component: engine
2013-07-01 16:37:13 -07:00
Andy Rothfusz 52be3958ff Cleaning up the welcome page, terminology.
Upstream-commit: cb1fdb2f0380e43f38f3b37562edc83122c8349f
Component: engine
2013-07-01 16:37:13 -07:00
Victor Vieux b992f88df2 Merge pull request #1078 from kstaken/fix_json_error
* Remote API: Small fix in /start if empty host config
Upstream-commit: d1d66b9c5f79dc3c7b6c22c0841d5c2ba96ba51e
Component: engine
2013-07-01 16:36:58 -07:00
Louis Opter 18ad40a645 Fix TestGetInfo when there is more than one image in the test repository
See also #1089, #1072.
Upstream-commit: 6dacbb451f1134ca1c215bd86b74006934468922
Component: engine
2013-07-01 15:06:08 -07:00
Guillaume J. Charmes 08f73695ab Merge pull request #1089 from dotcloud/multiple_test_images-fix
- Tests: Fix unit tests when there is more than one tag within the test image
Upstream-commit: ead9cefadbd19a4a855507bc482ef2464dd8c143
Component: engine
2013-07-01 13:58:04 -07:00
Guillaume J. Charmes 4af6128790 Merge pull request #1086 from crosbymichael/1008-image-entrypoint
+ Builder: Add Entrypoint to builder and container config
Upstream-commit: 185a2fc55e64a828d8443b912505283b6f8b97d4
Component: engine
2013-07-01 13:33:12 -07:00
Ken Cochrane 10626ab362 Merge pull request #1088 from kpelykh/master
* Documentation: Update Docker Remote API client list to include Java library
Upstream-commit: fb8fac6c6020cf9cdd1b7be40ba5c13d80c31d73
Component: engine
2013-07-01 12:50:31 -07:00
Guillaume J. Charmes 4fd8f2839f Fix unit tests when there is more than one tag within the test image
Upstream-commit: b6f288a1cedbbff7dd24362f2fc2bce0040bfe10
Component: engine
2013-07-01 11:45:45 -07:00