Commit Graph

7359 Commits

Author SHA1 Message Date
8b6dc7dcb1 Merge pull request #5575 from vieux/pr-5428
Upstream-commit: 51933bd5e1d10eb4a3151088cf344d0d6e06a192
Component: engine
2014-05-05 13:48:36 -07:00
0bd739f261 Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers
Upstream-commit: 7c3a06634b8aeb10494d924d5461566aa7228a87
Component: engine
2014-05-05 13:48:11 -07:00
4c66bae2c4 Merge pull request #5596 from dotcloud/contrib-fix
Post-commit hook URL fix
Upstream-commit: 07db13509b1e793e37a826fed2bd3924b5b85862
Component: engine
2014-05-05 13:44:48 -07:00
db1f1daa38 Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
Upstream-commit: 99be2353329c7106958a852eb08776fac5c0c2b0
Component: engine
2014-05-05 13:41:43 -07:00
dee350b3ad Merge pull request #5604 from nirvdrum/patch-1
It's its.
Upstream-commit: 13c1865541bf368cf3e8955559ae03704fae2a3c
Component: engine
2014-05-05 21:49:47 +02:00
9af67222a6 Merge pull request #5580 from tianon/update-vendor-versions
Update vendored deps that have a proper version number to use said specific versions
Upstream-commit: 168452f9b03651e979f99647865c199d497d2051
Component: engine
2014-05-05 13:45:03 -06:00
dae2f35ca5 It's its.
Upstream-commit: b25208ee3e4d652d8b1f86ffac343b718118b745
Component: engine
2014-05-05 15:43:11 -04:00
1812682982 Merge pull request #5544 from vieux/cleanup_api_client
Cleanup api client
Upstream-commit: 34e09afa24503e03d74f93f110ce752c38f39071
Component: engine
2014-05-05 11:16:57 -07:00
af1152733c Merge pull request #5591 from alexlarsson/fix-expose-parsing
nat: Fix --expose protocol parsing
Upstream-commit: e3d6898da1c1691b8c4ad215d0123e9d87879bcd
Component: engine
2014-05-05 10:32:26 -07:00
b560ddbfed Merge pull request #5496 from unclejack/check_if_root
check if the daemon is run as root on startup
Upstream-commit: 5f301191cfd16d6898514112658e91eaaff238b3
Component: engine
2014-05-05 10:13:17 -07:00
eebd02a00b Merge pull request #5569 from vieux/add__ping_to_the_API
Add  ping to the api
Upstream-commit: f369278725a2c31f5fa2ba2da33ad513f54a5897
Component: engine
2014-05-05 10:09:31 -07:00
60d8f8a368 Merge pull request #5562 from rhatdan/master
Fix docker man page to reference selinux-enable flag
Upstream-commit: d103f0186a041749bbddc19439f852acdb0b7a1e
Component: engine
2014-05-05 10:34:49 -06:00
339b3d71d5 Merge pull request #5592 from SvenDowideit/docs-simplify-osx-install
Several OSX install reader issues fixed
Upstream-commit: 30d458c53414e6b55506c5fa841a0cac7c8c64d4
Component: engine
2014-05-05 16:46:03 +02:00
0cfb634c08 Post-commit hook URL fix
Updating CONTRIBUTING to include the correct URL for the post-commit hook.

Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
Upstream-commit: 10766e1fb46770a407b2b17ade313dd5ae85054e
Component: engine
2014-05-05 10:28:52 -04:00
7225779c77 Several reader issues fixed
- Fix boot2docker url
- move HomeBrew instructions to a separate section
- fix docker client 5-liner to work (its still ugly)
- fix and update program output

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 56d71ae79bbbdd0d1eb97408c6132687a33ec113
Component: engine
2014-05-05 22:52:12 +10:00
acd8c3ad90 Fix docker man page to reference selinux-enable flag
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: e625bad3d7e5eb08568cbd09d9d574b8c63fd203
Component: engine
2014-05-05 08:41:21 -04:00
1d1a0132b4 Rearrange the existing info a little, and add example style guide
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 46755dfc1aa30a418a11dc8e352c600ef365b969
Component: engine
2014-05-05 22:18:12 +10:00
d3a11fcddf nat: Fix --expose protocol parsing
A command like:
 docker run --expose 5353/tcp -P fedora sleep 10

Currently fails with:
Error: Cannot start container 5c558de5f0bd85ff14e13e3691aefbe531346297a27d4b3562732baa8785b34a: unknown protocol

This is because nat.SplitProtoPort() confuses the order of the port and
proto in 5353/tcp, assuming the protocol is first. However, in all other
places in docker the protocol is last, so the fix is just to swap these.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a304dcef00d639b2f5dbf8d7561f1f8de7124573
Component: engine
2014-05-05 12:54:10 +02:00
907fa6b5fd Update devenvironment.md
`git clone` should use `https` URL.
Upstream-commit: 6799d14cb8cb9986d4a38473cddd009b96e717c8
Component: engine
2014-05-04 17:52:48 +01:00
ab2cd6cfbd Update vendored deps that have a proper version number to use said specific versions
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 8d7ed2cae49918c9f31e9fd068b28c8e114e939b
Component: engine
2014-05-03 20:34:21 -06:00
9cf8b76f14 Fixed a couple of single dashes in links document
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: bfac0b24ed66277c66807466e9d429624b1179e6
Component: engine
2014-05-04 03:16:21 +02:00
2247041861 Merge pull request #5578 from msulima/patch-1
hello_world.md - $container_id variable case sensitivity
Upstream-commit: 54e20b8f7b27fa28bf60f78900d812ce5f0bf8b9
Component: engine
2014-05-03 12:53:14 +01:00
429d160907 Merge pull request #5568 from felixrabe/patch-6
cli.md: More typos
Upstream-commit: f33298024ba1f3bbcc9f51faefa16ee4de84f429
Component: engine
2014-05-03 12:50:57 +01:00
f47e440d42 Merge pull request #5572 from felixrabe/patch-5
run.md: Close braces
Upstream-commit: 49af92a7a98eba22303bd5d796bc3a2c88193948
Component: engine
2014-05-03 12:42:04 +01:00
e52ce63fdc Merge pull request #5564 from felixrabe/patch-4
cli.md: sudo at the right place
Upstream-commit: d0c97d5bd2ae3565736dabe4c44958f68e2b2355
Component: engine
2014-05-03 12:36:31 +01:00
7886f3a367 Merge pull request #5551 from felixrabe/patch-1
cli.md: Fix up Markdown formatting by adding one `
Upstream-commit: b2268d1ac0e98440b0145040b13b99c3a0ac9c58
Component: engine
2014-05-03 21:02:25 +10:00
03eb40fbf6 Merge pull request #5570 from felixrabe/patch-3
run.md: Convert some backticks to apo's
Upstream-commit: a911f42d1ec8781aafc56a4363e47c6e23d35496
Component: engine
2014-05-03 20:39:01 +10:00
fe7021118f hello_world.md - $container_id variable case sensitivity
If you run the tutorial step-by-step, following error occurs:

```$ sudo docker logs $container_id
Usage: docker logs CONTAINER
Fetch the logs of a container
  -f, --follow=false: Follow log output```

This is obviously because bash variables are case-sensitive, so it mustn't be `CONTAINER_ID` above.

Docker-DCO-1.1-Signed-off-by: Mateusz Sulima <sulima.mateusz@email.com> (github: github_handle)
Upstream-commit: dca1c0073f42b0d75e914119eae863d6e6087cd6
Component: engine
2014-05-03 12:22:33 +02:00
7019e452c0 remove fixme
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 328d65dcff423b14e76f03ee65445032da31ed42
Component: engine
2014-05-03 00:54:52 +00:00
231057613f Move 'search' to the registry subsystem
This continues the effort to separate all registry logic from the
deprecated `Server` object.

* 'search' is exposed by `github.com/dotcloud/docker/registry/Service`
* Added proper documentation of Search while I was at it

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c4089ad80bcc1466535696ac0b11d388df529391
Component: engine
2014-05-03 00:37:32 +00:00
3dfee4b46a Move 'auth' to the registry subsystem
This is the first step towards separating the registry subsystem from
the deprecated `Server` object.

* New service `github.com/dotcloud/docker/registry/Service`
* The service is installed by default in `builtins`
* The service only exposes `auth` for now...
* ...Soon to be followed by `pull`, `push` and `search`.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3d605683b3d272982399635a55ee81b2a7535e81
Component: engine
2014-05-03 00:37:06 +00:00
bb98c4c7b3 run.md: Close braces
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io> (github: felixrabe)
Upstream-commit: 4a3b0e8d5d2653cfecbfee370be2406265211253
Component: engine
2014-05-03 02:20:59 +02:00
f69322b472 Merge pull request #5556 from crosbymichael/no-restrict-lxc
Don't restrict lxc because of apparmor
Upstream-commit: 3a1f0dedc71712403c591dd9e552f7a906c2e4ea
Component: engine
2014-05-02 17:20:27 -07:00
937cae5963 run.md: Convert some backticks to apo's
Upstream-commit: 205bd91fcab30292ac5f246ce9bdbb045ad1023f
Component: engine
2014-05-03 02:11:00 +02:00
a0c76094c7 Merge pull request #5063 from vieux/force_rmi_stopped_container
docker rmi -f works with stopped containers + revamped error messages
Upstream-commit: 5bb430197ef488644185a82b6d0abfe2155d6335
Component: engine
2014-05-02 16:41:13 -07:00
f8cb02bd82 api/server: better error checking to avoid unnecessary panics
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: f37ce76bf68d4935accd1018c904e80e42066f9f
Component: engine
2014-05-02 16:03:37 -07:00
57e3f2c8d8 cli.md: More typos
I've seen one other missing space that I addressed in another PR already.
I don't know whether that is a common occurrence in the docs.

About the second diff chunk, it looks like some copy-paste mistake to me.

Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io> (github: felixrabe)
Upstream-commit: 015a2abafa92ecc61fe5828a285a1e6dcfa07693
Component: engine
2014-05-03 00:52:48 +02:00
554600b198 Merge pull request #5563 from felixrabe/patch-3
cli.md: Add space
Upstream-commit: cefb0d12775c92ed0ae439b126008bcedd7b2ce0
Component: engine
2014-05-02 23:33:48 +01:00
d8a9af74f2 Merge pull request #5566 from felixrabe/patch-5
cli.md: Add another sudo
Upstream-commit: 069400a7ace488799233b4c1a279ac74b3a73ad8
Component: engine
2014-05-02 23:32:33 +01:00
e8fbf35f7c Engine: empty job names are illegal, catchall or not
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3b73c26194836c1e2b737146a5b0c840226c65d2
Component: engine
2014-05-02 15:25:33 -07:00
8727b434c7 engine: catchall handler is shadowed by specific handlers
This allows using `Engine.Register` and `Engine.RegisterCatchall` on the
same engine without the catchall hiding all other handlers.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: de75af9fe2d91df7297e498d320b496addfb52f4
Component: engine
2014-05-02 15:25:32 -07:00
f993f95731 Merge pull request #5560 from gabrtv/deregister-containers-earlier
De-register containers before removing driver and containerGraph references
Upstream-commit: 103d02813238c2bb8c91625401427716f5bf988f
Component: engine
2014-05-02 15:20:51 -07:00
acb5373ef6 Merge pull request #5567 from creack/remove_unused_file
Upstream-commit: a0cef4106187b12768c21939ff2356c85475995d
Component: engine
2014-05-02 15:08:42 -07:00
18e1876580 return write error
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: c65de2c0207ac67e5023ada8709490ef4627bd01
Component: engine
2014-05-02 22:03:59 +00:00
5f23d92b72 cli.md: sudo at the right place
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io> (github: felixrabe)
Upstream-commit: e318af6fb097ce5157b6766d8dfe921403858756
Component: engine
2014-05-02 23:58:05 +02:00
16cdcfd13d add doc
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3c422fe5bf45391a509fd3c7f33033baefb0a234
Component: engine
2014-05-02 21:51:20 +00:00
81be77fbe1 Merge pull request #5462 from tianon/hack-dind-style
Update hack/dind to match the rest of our scripts
Upstream-commit: b3ff1c55e34d7b92843ca05bbac70e357e7ae8d0
Component: engine
2014-05-02 14:43:56 -07:00
11bde7fe02 add _ping endpoint
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: cf0076b92dd11b3bda9ac7982e374d4531925ff9
Component: engine
2014-05-02 21:43:51 +00:00
397faaf38a Remove unused daemon/sorter.go
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 8913ec4912e529be44b7cc2aaf465b0d9b03ffc9
Component: engine
2014-05-02 14:16:05 -07:00
6ac22e7613 cli.md: Add another sudo
Upstream-commit: 4706a1ad76ed9bc6c0555499d0bd8b8eea3b3604
Component: engine
2014-05-02 23:13:28 +02:00