6c91c91066
More informative error message on name collisions
...
This is the proposed fix for #2506 . It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.
I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
2013-11-18 17:51:47 +00:00
58c14de9fd
Fix images not being properly tagged
...
Upstream-commit: 0e64b987e8cbbd6944bd0594f8173f959867f4fc
Component: engine
2013-11-16 11:05:38 -05:00
b91918adb1
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
Upstream-commit: 51576069ad7470d308402536306c35f47cf89edb
Component: engine
2013-11-15 18:21:34 -08:00
25c99ca04e
Re-enable api integration tests using only public remote API.
...
Upstream-commit: afe230718ead8cb1d1053a7132a034f0bd55b424
Component: engine
2013-11-16 02:12:14 +00:00
c2f970187c
Merge pull request #2709 from eugenkrizo/patch-1
...
path needs to be specified to 'docker build' command
Upstream-commit: e12bba66ea784e0c7859b5679d6a55d639889508
Component: engine
2013-11-15 13:34:08 -08:00
4f21d884c5
Merge pull request #2713 from eugenkrizo/patch-2
...
port published explicitly (for docker 0.6.6)
Upstream-commit: 92c3a319fba58132bfc918a3bde8dcc64e00304c
Component: engine
2013-11-15 13:32:18 -08:00
f5175fa4bb
Merge pull request #2685 from Painted-Fox/patch-1
...
Add more depth to the upstart example in host_integration.rst
Upstream-commit: 323e86032db8941135bea418cfbddc8d20739c0e
Component: engine
2013-11-15 12:28:07 -08:00
d46ca98228
bring back tests about LXCConfig
...
Upstream-commit: c06d903edd7b16588e68680a989b73e27d990871
Component: engine
2013-11-15 11:48:18 -08:00
07dd17035d
Merge pull request #2689 from metalivedev/fix-syntax
...
Clean up sphinx syntax
Upstream-commit: 6341768393a8b48cc37e29f43efdffd3fa4caf33
Component: engine
2013-11-15 11:09:51 -08:00
b2bdca3ec2
Merge pull request #2712 from makinacorpus/master
...
Do not drop sys_boot
Upstream-commit: ad96d5ff04dd9b8284bad4f86ed285f905723951
Component: engine
2013-11-15 10:33:41 -08:00
3c67b07093
port published explicitly (for docker 0.6.6)
...
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
Upstream-commit: 492ce4c665b7d55d1496fb7e822a49ff0d44809d
Component: engine
2013-11-15 17:12:48 +01:00
bc283849de
path needs to be specified to 'docker build' command
...
current folder '.' appended as a path
Upstream-commit: 007964793dd619279bfb48c3fa84ada65aa599bd
Component: engine
2013-11-15 16:16:59 +01:00
a9461ab782
Merge pull request #2690 from codevin/master
...
Improvise documentation for builder.rst / VOLUME command
Upstream-commit: bed87ea1038321d4c58d379040acdbd824cb8b7c
Component: engine
2013-11-14 19:23:18 -08:00
3372c0c790
Move iptables test to integration tests
...
Upstream-commit: 823674816e59e1e8c3f768a97585c69e1d86ead8
Component: engine
2013-11-15 01:15:39 +00:00
2a4f3940f0
Split auth tests between unit tests and integration tests
...
Upstream-commit: 8d3e35cd8d92d184dc66041c235163cab4953842
Component: engine
2013-11-15 01:13:20 +00:00
d641b4b09e
Fix the brittle errorstring-to-httperror recognition code which in turn is required by autopull (the client issues a pull if container creation returns 404)
...
Upstream-commit: 693ff4d2ae5f0d723469340f67bb55f7aa3e824b
Component: engine
2013-11-14 23:54:28 +00:00
26146eb208
move TestMount to integration
...
Upstream-commit: 596810d8db17c246c9c5107e7ecc6eb781454f36
Component: engine
2013-11-14 15:17:31 -08:00
7456f6a466
fix Integration tests
...
Upstream-commit: 661a8a0e0ce95d9bcb222184c14373fb1dbb1aec
Component: engine
2013-11-14 14:46:13 -08:00
bf15883f56
Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm
...
Fix lxc start for shared root filesystems
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
2013-11-14 11:20:53 -08:00
54481185b5
Remove deprecated tags_test.go
...
Upstream-commit: e9624bf715134294a7fac1ab8a43508139000253
Component: engine
2013-11-14 10:50:43 -08:00
13d08cbd03
gofmt
...
Upstream-commit: 2a209afe5fe0f27296e3e06a199bb5305910e1cf
Component: engine
2013-11-14 10:50:43 -08:00
1880f01ff8
Integration tests: remove dependency on private APIs
...
Upstream-commit: c001a5af67b7b811a8fc69011fcffc2656b8fd99
Component: engine
2013-11-14 10:50:43 -08:00
6c1679864e
Move integration tests to integration/, expose missing public methods in the core
...
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
2013-11-14 10:50:00 -08:00
7b5ae8dd36
thankyou @tomdz - I forgot about URL based ADDs
...
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
2013-11-14 14:53:55 +10:00
7c37de4a14
Improvise documentation for builder.rst / VOLUME command
...
Upstream-commit: 37abc07852874939aabe7ba9a346d4d893e40409
Component: engine
2013-11-14 09:54:31 +05:30
d8cd1b4245
Merge pull request #2688 from dhrp/doc-layout-dotcloud-to-docker-inc
...
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added Read the Docs.
Upstream-commit: 61abc3f8ac89bd3b238a7ceaf26fa004c462848b
Component: engine
2013-11-13 18:31:21 -08:00
e96e8ebc75
Merge pull request #2661 from rogaha/links_docs
...
- Added a doc about Links and Container Naming
Upstream-commit: 5fc56b6b47ede3f6c86177fa315743196854412b
Component: engine
2013-11-13 18:15:25 -08:00
35545fd6bb
Clean up sphinx syntax, upgrade http markup package, minor link changes, update intro.
...
Upstream-commit: 059950b095a48c254a9f407f2bff13eaab7a7a1c
Component: engine
2013-11-13 17:45:22 -08:00
687d57d2f0
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added link to Read the Docs for giving them credit to hosting us. (Thanks Read The Docs!)
...
Upstream-commit: 9ab85f4d1220d04a3b682d5612ff27db5983f5d3
Component: engine
2013-11-13 16:09:23 -08:00
de14ff2222
Merge pull request #2679 from FreekKalter/master
...
fix error in python webapp example
Upstream-commit: 3cf23b93eaf0b51983204bb28182eb39c0791559
Component: engine
2013-11-13 13:35:01 -08:00
048409a651
Merge pull request #2676 from tianon/go1.2rc4
...
Update to go1.2rc4
Upstream-commit: 3ba6835ead266a9f365b897ca29db8de2278e994
Component: engine
2013-11-13 11:45:56 -08:00
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
8a1c75284e
Merge pull request #2660 from SvenDowideit/2601-remote-api-json-case
...
update the API docs to reflect the change in the case of the /index/search reposnse
Upstream-commit: 8e71391572adeaa6e5d0f980e71168ba8ef98b46
Component: engine
2013-11-13 11:17:54 -08:00
cbc18a2e03
Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations
...
add a little more info about the limitations of ADD wrt ../ and docker build
Upstream-commit: 077c2496ed39b6682924b1da9d388e5a21453310
Component: engine
2013-11-13 10:56:35 -08:00
6b9d5c5bd5
Merge pull request #2652 from tianon/upstart-defaults-too
...
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
Upstream-commit: b94e9ed0de0817d07ad590e5d32262016f25e6e8
Component: engine
2013-11-13 10:42:41 -08:00
01395ce3bb
Add more depth to the upstart example in host_integration.rst
...
I found that the original example wasn't starting the docker container when docker is started. So, I modified it using information I found from https://groups.google.com/forum/#!msg/docker-user/OWz8EOpiXuo/L_uxGFQuYlkJ
Also, upstart wasn't starting docker if it wasn't running ahead of time. So, I added a change to the docker upstart script to solve this.
Upstream-commit: 02884ee42971be141edde8964d72a2d2c7f63cfe
Component: engine
2013-11-13 13:34:34 -05:00
a905d364a8
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
...
Upstream-commit: 8145e57cee6390bb27d7fb07fe5f572affe5d0cd
Component: engine
2013-11-13 10:29:29 -08:00
95762ca3a4
Merge pull request #2673 from shykes/engine-patch-2
...
* Engine: expand the engine API with 'create' and 'start' jobs Edit
Upstream-commit: c964494d315ea672e2a4987cbfd9c9e8852553b8
Component: engine
2013-11-13 10:14:56 -08:00
2a405d59e4
Merge pull request #2656 from shykes/export-restrictions-debian
...
Change crypto export notice to meet Debian requirements
Upstream-commit: c6e83b8779f6792163548f216f6402f691e3ee61
Component: engine
2013-11-13 09:37:23 -08:00
59d38006c9
add a little more info about the limitations of ADD wrt ../ and docker build -
...
Upstream-commit: af0b2e38c3b2688cd4c2e831847bf4601d8fc149
Component: engine
2013-11-13 22:55:55 +10:00
6d93aad6a7
Typo in ROADMAP.md
...
Upstream-commit: 87b4bb9fcc41806da4ed3151e74511120c099115
Component: engine
2013-11-13 12:32:49 +00:00
172689d6bb
fix error in python webapp example
...
When getting the private port used by a container using
`docker port` returns 0.0.0.0:49353, stript just the portnumber of the address with awk to used it in the rest of the example code.
Upstream-commit: f5e6c2d060d5eb052929c4ab14bf3256b260afc4
Component: engine
2013-11-13 13:20:38 +01:00
b5a0f0ad5b
update the v1.7 API to reflect the case change in the /index/search response, and note that its to align better with the registry server response that its proxying
...
Upstream-commit: f0f8462d18cf2efc44ee48cfdd2706e8a4a800d6
Component: engine
2013-11-13 22:11:20 +10:00
c52a89950a
Update to go1.2rc4
...
Upstream-commit: 8523d5518c500903c19a53f73c653318e4db38f9
Component: engine
2013-11-12 21:51:12 -07:00
a48718c85a
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
2013-11-13 00:36:20 +00:00
cd79a08f60
Merge pull request #2612 from tianon/release-script-tweaks
...
* Hack: release script tweaks
Upstream-commit: 3885ef585bf132a04e174f32e6bb7e86d7730c32
Component: engine
2013-11-12 15:04:26 -08:00
5c6b4b612c
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
Upstream-commit: 388057f11a20fd8b4bfd7d1b0d9f0cb18a72afa8
Component: engine
2013-11-12 14:40:17 -08:00
071e45dc12
Merge pull request #2663 from viirya/fix_nameserver_regex
...
Fix nameserver regex
Upstream-commit: c69e6a90e49d27916a8294044510b968206ab4a2
Component: engine
2013-11-12 12:29:40 -08:00
9c96f5d03b
Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running
...
on docker start, do not cleanup if already running
Upstream-commit: 71c05bb87c4f005ce8f87caa512d4a85896543fb
Component: engine
2013-11-12 11:02:10 -08:00
6ba500a617
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
...
Runtime: prevent deletion if image is used by a running container
Upstream-commit: 637850063c7c218db83857e5fd01c3a472094a8d
Component: engine
2013-11-12 11:01:51 -08:00
