7033d58dca
Fix installation link from welcome page.
...
Upstream-commit: 11998ae7d62ee17856ead81ce49409dc63643d62
Component: engine
2013-07-02 16:48:57 -07:00
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
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
92fbe05ddb
Cleaning up the welcome page, terminology, and images.
...
Upstream-commit: ff964d327d030221b4e65661cee0ee0826bcdb32
Component: engine
2013-07-02 15:03:29 -07:00
4deb63608f
Fix broken quickstart link
...
Upstream-commit: 4b8688f1e5a5998e10bdc1d7b39458a611a25eef
Component: engine
2013-07-02 14:10:06 -07:00
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
ad16b4b27c
Shortened lines to 80 columns
...
Upstream-commit: dd4c6f6a09c98f075fc5964242792d9e9f2c20d4
Component: engine
2013-07-02 12:09:57 -07:00
df5dac21e6
Clean up image text, minor updates to docs.
...
Upstream-commit: 6058261a26b9e23926612fddfd8ad37bfcf1dd9c
Component: engine
2013-07-02 12:09:57 -07:00
09eb5cc9ff
Adding files for terms
...
Upstream-commit: b461e4607de497096b0ec92bb05d5a88bfe0e48d
Component: engine
2013-07-02 12:09:57 -07:00
66a935418f
Cleaning up the welcome page, terminology.
...
Upstream-commit: d399f720983d94706bdaae528a2637778ca5b5e0
Component: engine
2013-07-02 12:09:57 -07:00
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
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
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
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
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
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
438fda3245
add sleep in tests and go fmt
...
Upstream-commit: ebba0a60245b487e6d3d242f47c8999321ec5d29
Component: engine
2013-07-02 10:47:37 +00:00
8f4cd54500
Merge pull request #1099 from lopter/master
...
*Test : Fix
Upstream-commit: c9236d99d2c98c6b72fa97f25d958a90faf6873c
Component: engine
2013-07-02 02:42:21 -07:00
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
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
44f9a36ca8
Rephrase changelog
...
Upstream-commit: fe0378e9b36b89d5eb01b4c2bf8c160305a958a7
Component: engine
2013-07-01 17:05:49 -07:00
8b7816d5d5
Bump version to 0.4.8
...
Upstream-commit: 96a1d7c6455b5b4326469f9a51bee869883aac3c
Component: engine
2013-07-01 16:58:25 -07:00
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
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
de55ad0e3d
Clean up image text, minor updates to docs.
...
Upstream-commit: b47873c5accd33964c33f718ceeda955d1a9a3c8
Component: engine
2013-07-01 16:37:13 -07:00
c4bb1a9c18
Adding files for terms
...
Upstream-commit: adf75d402ab428a16ac3d57d0154ddd02be2fb6b
Component: engine
2013-07-01 16:37:13 -07:00
52be3958ff
Cleaning up the welcome page, terminology.
...
Upstream-commit: cb1fdb2f0380e43f38f3b37562edc83122c8349f
Component: engine
2013-07-01 16:37:13 -07:00
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
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
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
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
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
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
9e16e5309d
Issue #1087 Docker Java API client -- added java to Docker Remote API Client document
...
Upstream-commit: aa9bec96b1d3aedcb67e6985ae5754e728665407
Component: engine
2013-07-01 11:28:40 -07:00
2e70c0f0f0
Add Entrypoint to builder and container config
...
By setting an entrypoint in the Dockerfile this
allows one to run an image and only pass arguments.
Upstream-commit: b16ff9f8598d30823f687d100d351cad11823e77
Component: engine
2013-07-01 05:34:27 -09:00
727efac9d6
Merge pull request #1085 from dotcloud/1076-doc_delete-fix
...
fix status code in doc
Upstream-commit: 348c5c4838f552118afda29cbef159a63031ea6b
Component: engine
2013-07-01 06:30:21 -07:00
867f33af50
fix status code in doc
...
Upstream-commit: 8dcc6a0280720237008e36e893028032cd66aa2a
Component: engine
2013-07-01 13:28:58 +00:00
6a579abd18
Merge pull request #1061 from proppy/fix-slices-ref
...
api,server: slice are already refs, no need to return ptr
Upstream-commit: 5e029f760000be547350e520302c5811d85fe525
Component: engine
2013-07-01 04:51:56 -07:00
b0d70e448b
Adding check for content-type header
...
Upstream-commit: d8d33e8b8bee1f1d37c60b9618a9008058d7abe6
Component: engine
2013-06-30 10:46:09 -07:00
5b3a7c0583
Documented release process for maintainers in hack/RELEASE.md
...
Upstream-commit: b37f7d49d8af31e52e5105898dcd799c9eae4c98
Component: engine
2013-06-29 22:08:25 -07:00
ce242fa10d
Merge pull request #1065 from dotcloud/bump_0.4.7
...
Bump version to 0.4.7
Upstream-commit: d67d5dd96307f3c6f393b0d6acd73a30e48caa3c
Component: engine
2013-06-29 21:23:59 -07:00
51b93736d6
* Hack: change builder tests to always use the current unit test image, instead of hardcoding 'docker-ut'
...
Upstream-commit: 273e0d42b7bd56f263d4d2d95fb27a692b875377
Component: engine
2013-06-29 21:22:15 -07:00
4240b58553
Bump version to 0.4.7
...
Upstream-commit: ca497a82abfe92f2dbe1a7e161dc7ff19eefeec4
Component: engine
2013-06-29 21:12:29 -07:00
f44918dcc7
* Hack: move unit tests to a different source image, to work around issues when docker-ut has more than 1 tag.
...
Upstream-commit: b7226316c716daf7648b2dc4de829f866a4377b5
Component: engine
2013-06-28 19:43:55 -07:00
84c3646cd3
Merge pull request #1052 from lopter/master
...
Fix a couple critical bugs on the test suite
Upstream-commit: 84f41954ae1b7aa5d21d2b27b119ad0b4b985627
Component: engine
2013-06-28 17:00:51 -07:00
e3b18af210
api,server: slice are already refs, no need to return ptr
...
Upstream-commit: 54da339b2c3d1fe11a465aff69fc4e00ec3b40fd
Component: engine
2013-06-28 12:41:09 -07:00
ddffbf8c3d
Fixed conflicts
...
Upstream-commit: ac37fcf6f3f28f56b4ad58143891be9b1fe99dec
Component: engine
2013-06-28 12:36:59 -07:00
2be0a9146e
Resolve conflict
...
Upstream-commit: 893c974b08b8859a4d6d3d7d38d9c21c9b6472c3
Component: engine
2013-06-28 12:32:41 -07:00
d496b27176
Merge pull request #700 from dotcloud/615-pushbyid
...
Allow to push/pull on independent registries (by repository or image ID)
Upstream-commit: 30342efa37877d7f731d974661d18783c442c8d0
Component: engine
2013-06-28 10:29:10 -07:00
fe04096783
Merge pull request #1057 from dotcloud/973-testing-stabilization
...
testing|stabilization, issue 973: Use docker-golang PPA and lts-raring kernel
Upstream-commit: 6165c246d4481237c06cd4f75a23cc67922ae19f
Component: engine
2013-06-28 09:54:06 -07:00
