Victor Vieux
ad96d5ff04
Merge pull request #2712 from makinacorpus/master
...
Do not drop sys_boot
2013-11-15 10:33:41 -08:00
eugenkrizo
492ce4c665
port published explicitly (for docker 0.6.6)
...
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
2013-11-15 17:12:48 +01:00
Mathieu Le Marec - Pasquet
76ab8fa00f
Merge pull request #1 from jpetazzo/2392-add-kernel-docs
...
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
2013-11-15 07:58:54 -08:00
eugenkrizo
007964793d
path needs to be specified to 'docker build' command
...
current folder '.' appended as a path
2013-11-15 16:16:59 +01:00
Andy Rothfusz
bed87ea103
Merge pull request #2690 from codevin/master
...
Improvise documentation for builder.rst / VOLUME command
2013-11-14 19:23:18 -08:00
Solomon Hykes
823674816e
Move iptables test to integration tests
2013-11-15 01:15:39 +00:00
Solomon Hykes
8d3e35cd8d
Split auth tests between unit tests and integration tests
2013-11-15 01:13:20 +00:00
Guillaume J. Charmes
84ed18827a
Merge pull request #2704 from shykes/fix-auto-pull
...
Fix the brittle errorstring-to-httperror recognition code
2013-11-14 16:15:46 -08:00
Solomon Hykes
693ff4d2ae
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)
2013-11-14 23:54:28 +00:00
Victor Vieux
596810d8db
move TestMount to integration
2013-11-14 15:17:31 -08:00
Victor Vieux
661a8a0e0c
fix Integration tests
2013-11-14 14:46:13 -08:00
Michael Crosby
629c6e3649
Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm
...
Fix lxc start for shared root filesystems
2013-11-14 11:20:53 -08:00
Andy Rothfusz
c7aaf831d7
Merge pull request #2691 from SvenDowideit/add-instruction-path-limitations
...
except URL-based ADDs
2013-11-14 11:12:08 -08:00
Solomon Hykes
e9624bf715
Remove deprecated tags_test.go
2013-11-14 10:50:43 -08:00
Solomon Hykes
2a209afe5f
gofmt
2013-11-14 10:50:43 -08:00
Victor Vieux
c001a5af67
Integration tests: remove dependency on private APIs
2013-11-14 10:50:43 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
¨Sven
e42144674f
thankyou @tomdz - I forgot about URL based ADDs
2013-11-14 14:53:55 +10:00
Vinod Kulkarni
37abc07852
Improvise documentation for builder.rst / VOLUME command
2013-11-14 09:54:31 +05:30
Andy Rothfusz
61abc3f8ac
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.
2013-11-13 18:31:21 -08:00
Andy Rothfusz
5fc56b6b47
Merge pull request #2661 from rogaha/links_docs
...
- Added a doc about Links and Container Naming
2013-11-13 18:15:25 -08:00
Andy Rothfusz
059950b095
Clean up sphinx syntax, upgrade http markup package, minor link changes, update intro.
2013-11-13 17:45:22 -08:00
Thatcher Peskens
9ab85f4d12
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!)
2013-11-13 16:09:23 -08:00
Andy Rothfusz
3cf23b93ea
Merge pull request #2679 from FreekKalter/master
...
fix error in python webapp example
2013-11-13 13:35:01 -08:00
Guillaume J. Charmes
3ba6835ead
Merge pull request #2676 from tianon/go1.2rc4
...
Update to go1.2rc4
2013-11-13 11:45:56 -08:00
Guillaume J. Charmes
dc13b9473f
Merge pull request #2686 from shykes/gofmt
...
gofmt
2013-11-13 11:35:37 -08:00
Solomon Hykes
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
Andy Rothfusz
8e71391572
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
2013-11-13 11:17:54 -08:00
Andy Rothfusz
077c2496ed
Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations
...
add a little more info about the limitations of ADD wrt ../ and docker build
2013-11-13 10:56:35 -08:00
Tianon Gravi
b94e9ed0de
Merge pull request #2652 from tianon/upstart-defaults-too
...
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
2013-11-13 10:42:41 -08:00
Ryan Seto
02884ee429
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.
2013-11-13 13:34:34 -05:00
Jérôme Petazzoni
8145e57cee
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
2013-11-13 10:29:29 -08:00
Solomon Hykes
c964494d31
Merge pull request #2673 from shykes/engine-patch-2
...
* Engine: expand the engine API with 'create' and 'start' jobs Edit
2013-11-13 10:14:56 -08:00
Solomon Hykes
c6e83b8779
Merge pull request #2656 from shykes/export-restrictions-debian
...
Change crypto export notice to meet Debian requirements
2013-11-13 09:37:23 -08:00
Guillaume J. Charmes
369e39aea1
Merge pull request #2680 from inglesp/patch-1
...
Typo in ROADMAP.md
2013-11-13 09:19:37 -08:00
¨Sven
af0b2e38c3
add a little more info about the limitations of ADD wrt ../ and docker build -
2013-11-13 22:55:55 +10:00
inglesp
87b4bb9fcc
Typo in ROADMAP.md
2013-11-13 12:32:49 +00:00
Freek Kalter
f5e6c2d060
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.
2013-11-13 13:20:38 +01:00
¨Sven
f0f8462d18
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
2013-11-13 22:11:20 +10:00
Tianon Gravi
8523d5518c
Update to go1.2rc4
2013-11-12 21:51:12 -07:00
Solomon Hykes
6c4393ccbb
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
2013-11-13 00:36:20 +00:00
Solomon Hykes
3885ef585b
Merge pull request #2612 from tianon/release-script-tweaks
...
* Hack: release script tweaks
2013-11-12 15:04:26 -08:00
Victor Vieux
388057f11a
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
2013-11-12 14:40:17 -08:00
Guillaume J. Charmes
c69e6a90e4
Merge pull request #2663 from viirya/fix_nameserver_regex
...
Fix nameserver regex
2013-11-12 12:29:40 -08:00
Victor Vieux
71c05bb87c
Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running
...
on docker start, do not cleanup if already running
2013-11-12 11:02:10 -08:00
Victor Vieux
637850063c
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
...
Runtime: prevent deletion if image is used by a running container
2013-11-12 11:01:51 -08:00
Victor Vieux
dcc9980550
Merge pull request #2657 from dotcloud/fix_docker_images_output
...
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-12 11:01:29 -08:00
Victor Vieux
e405337926
Merge pull request #2669 from tianon/clarify-test-calls
...
Add clarification of multiple "go test" calls in hack/make/*test
2013-11-12 10:42:24 -08:00
Tianon Gravi
5cdb3aec50
Add clarification of multiple "go test" calls in hack/make/*test
2013-11-12 11:23:06 -07:00
Victor Vieux
b314f19db8
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
2013-11-12 10:19:29 -08:00