b25208ee3e
It's its.
2014-05-05 15:43:11 -04:00
34e09afa24
Merge pull request #5544 from vieux/cleanup_api_client
...
Cleanup api client
2014-05-05 11:16:57 -07:00
e3d6898da1
Merge pull request #5591 from alexlarsson/fix-expose-parsing
...
nat: Fix --expose protocol parsing
2014-05-05 10:32:26 -07:00
5f301191cf
Merge pull request #5496 from unclejack/check_if_root
...
check if the daemon is run as root on startup
2014-05-05 10:13:17 -07:00
f369278725
Merge pull request #5569 from vieux/add__ping_to_the_API
...
Add ping to the api
2014-05-05 10:09:31 -07:00
d103f0186a
Merge pull request #5562 from rhatdan/master
...
Fix docker man page to reference selinux-enable flag
2014-05-05 10:34:49 -06:00
30d458c534
Merge pull request #5592 from SvenDowideit/docs-simplify-osx-install
...
Several OSX install reader issues fixed
2014-05-05 16:46:03 +02:00
56d71ae79b
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)
2014-05-05 22:52:12 +10:00
e625bad3d7
Fix docker man page to reference selinux-enable flag
...
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-05-05 08:41:21 -04:00
e9fd8e285e
Merge pull request #5587 from SvenDowideit/docs-examples-style-guide
...
Rearrange the existing info a little, and add example style guide
2014-05-05 13:36:47 +01:00
46755dfc1a
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)
2014-05-05 22:18:12 +10:00
a304dcef00
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)
2014-05-05 12:54:10 +02:00
3230889d24
Merge pull request #5585 from lukemarsden/patch-1
...
git clone should use https URL in devenvironment.md
2014-05-05 08:48:13 +10:00
6799d14cb8
Update devenvironment.md
...
`git clone` should use `https` URL.
2014-05-04 17:52:48 +01:00
9488832c6d
Merge pull request #5579 from jamtur01/linkdashs
...
Fixed a couple of single dashes in links document
2014-05-04 13:28:46 +01:00
bfac0b24ed
Fixed a couple of single dashes in links document
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-05-04 03:16:21 +02:00
54e20b8f7b
Merge pull request #5578 from msulima/patch-1
...
hello_world.md - $container_id variable case sensitivity
2014-05-03 12:53:14 +01:00
f33298024b
Merge pull request #5568 from felixrabe/patch-6
...
cli.md: More typos
2014-05-03 12:50:57 +01:00
49af92a7a9
Merge pull request #5572 from felixrabe/patch-5
...
run.md: Close braces
2014-05-03 12:42:04 +01:00
d0c97d5bd2
Merge pull request #5564 from felixrabe/patch-4
...
cli.md: sudo at the right place
2014-05-03 12:36:31 +01:00
b2268d1ac0
Merge pull request #5551 from felixrabe/patch-1
...
cli.md: Fix up Markdown formatting by adding one `
2014-05-03 21:02:25 +10:00
a911f42d1e
Merge pull request #5570 from felixrabe/patch-3
...
run.md: Convert some backticks to apo's
2014-05-03 20:39:01 +10:00
dca1c0073f
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)
2014-05-03 12:22:33 +02:00
4a3b0e8d5d
run.md: Close braces
...
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io> (github: felixrabe)
2014-05-03 02:20:59 +02:00
3a1f0dedc7
Merge pull request #5556 from crosbymichael/no-restrict-lxc
...
Don't restrict lxc because of apparmor
2014-05-02 17:20:27 -07:00
205bd91fca
run.md: Convert some backticks to apo's
2014-05-03 02:11:00 +02:00
5bb430197e
Merge pull request #5063 from vieux/force_rmi_stopped_container
...
docker rmi -f works with stopped containers + revamped error messages
2014-05-02 16:41:13 -07:00
1c48dfebb9
Merge pull request #5537 from shykes/pr_out_api_server_better_error_checking_to_avoid_unnecessary_panics
2014-05-02 16:05:07 -07:00
f37ce76bf6
api/server: better error checking to avoid unnecessary panics
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-05-02 16:03:37 -07:00
015a2abafa
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)
2014-05-03 00:52:48 +02:00
cefb0d1277
Merge pull request #5563 from felixrabe/patch-3
...
cli.md: Add space
2014-05-02 23:33:48 +01:00
069400a7ac
Merge pull request #5566 from felixrabe/patch-5
...
cli.md: Add another sudo
2014-05-02 23:32:33 +01:00
103d028132
Merge pull request #5560 from gabrtv/deregister-containers-earlier
...
De-register containers before removing driver and containerGraph references
2014-05-02 15:20:51 -07:00
a0cef41061
Merge pull request #5567 from creack/remove_unused_file
2014-05-02 15:08:42 -07:00
c65de2c020
return write error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 22:03:59 +00:00
e318af6fb0
cli.md: sudo at the right place
...
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io> (github: felixrabe)
2014-05-02 23:58:05 +02:00
3c422fe5bf
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 21:51:20 +00:00
b3ff1c55e3
Merge pull request #5462 from tianon/hack-dind-style
...
Update hack/dind to match the rest of our scripts
2014-05-02 14:43:56 -07:00
cf0076b92d
add _ping endpoint
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 21:43:51 +00:00
8913ec4912
Remove unused daemon/sorter.go
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-05-02 14:16:05 -07:00
ac7b2b888d
Merge pull request #5565 from creack/fix_devpts
...
Month devpts before mounting subdirs
2014-05-02 14:14:46 -07:00
4706a1ad76
cli.md: Add another sudo
2014-05-02 23:13:28 +02:00
12a4b376fd
cli.md: Add space
2014-05-02 22:56:35 +02:00
a7ccbfd5f1
Month devpts before mounting subdirs
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-05-02 13:55:45 -07:00
45be6f6dff
fix https
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 19:49:12 +00:00
9f152aacf8
deregister containers before removing driver and containerGraph references
...
This is required to address a race condition described in #5553 ,
where a container can be partially deleted -- for example, the
root filesystem but not the init filesystem -- which makes
it impossible to delete the container without re-adding the
missing filesystems manually.
This behavior has been witnessed when rebooting boxes that
are configured to remove containers on shutdown in parallel
with stopping the Docker daemon.
Docker-DCO-1.1-Signed-off-by: Gabriel Monroy <gabriel@opdemand.com> (github: gabrtv)
2014-05-02 13:27:17 -06:00
4d521f479b
Merge pull request #5507 from shykes/dind-maintainer
...
Make Jerome Petazzoni a maintainer for dind
2014-05-02 11:25:41 -07:00
59fe77bfa6
Don't restrict lxc because of apparmor
...
We don't have the flexibility to do extra things with lxc because it is
a black box and most fo the magic happens before we get a chance to
interact with it in dockerinit.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-02 11:14:24 -07:00
1c5a3123cc
Merge pull request #5529 from crosbymichael/restrict-proc
...
Mount /proc and /sys read-only, except in privileged containers
2014-05-02 10:52:53 -07:00
8c9192cd76
move hijack to it's own file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-02 17:45:58 +00:00
Kevin Menard
Michael Crosby
Guillaume J. Charmes
Victor Vieux
Tianon Gravi
James Turnbull
Sven Dowideit
Dan Walsh
O.S. Tezer
Alexander Larsson
lukemarsden
Mateusz Sulima
Felix Rabe
Solomon Hykes
Victor Vieux
Jérôme Petazzoni
Guillaume J. Charmes
Gabriel Monroy
Michael Crosby