1cb3e810da
Address code review feedback
...
Also make sure we copy the joining containers hosts and resolv.conf with
the hostname if we are joining it's network stack.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0b187b909be1dac60194250bc6e9ff292a0bd5c9
Component: engine
2014-05-05 10:08:59 -07:00
ab8f143867
Add docs for --net flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c1c6b3ccd915084bc9472992afa16f677a074785
Component: engine
2014-05-05 10:08:59 -07:00
5fdf7d4579
Update host networking with hostname and files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5ca6532011436eee85ccb555a0832a82450454ea
Component: engine
2014-05-05 10:08:59 -07:00
0fcf738183
Setup host networking for lxc and native
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a785882b29b9f0b24ace8249576c5d8d7f8c1d94
Component: engine
2014-05-05 10:08:59 -07:00
ad111d4199
Update --net flags and container mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2c2cc051d831f54d1bb070642edcd876ff669e78
Component: engine
2014-05-05 10:08:59 -07:00
bb0461e564
runconfig/parse: add test for parseNetMode
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 7118416aeeb779373685d192c26a329e9acdef89
Component: engine
2014-05-05 10:08:59 -07:00
381004dc30
runconfig: add -net container:name option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: a60159f3b102244fc5470642bd32eb99d5ac329c
Component: engine
2014-05-05 10:08:59 -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
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
5d36c1da1d
Merge pull request #5587 from SvenDowideit/docs-examples-style-guide
...
Rearrange the existing info a little, and add example style guide
Upstream-commit: e9fd8e285e20ec3523a67fd635a263e66a6119db
Component: engine
2014-05-05 13:36:47 +01: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
53e7440fe4
Merge pull request #5585 from lukemarsden/patch-1
...
git clone should use https URL in devenvironment.md
Upstream-commit: 3230889d24d0193697eeb3da5669cb8fc68d4846
Component: engine
2014-05-05 08:48:13 +10:00
907fa6b5fd
Update devenvironment.md
...
`git clone` should use `https` URL.
Upstream-commit: 6799d14cb8cb9986d4a38473cddd009b96e717c8
Component: engine
2014-05-04 17:52:48 +01:00
cf662b0527
Merge pull request #5579 from jamtur01/linkdashs
...
Fixed a couple of single dashes in links document
Upstream-commit: 9488832c6dd19a740f95c160d6dd42b30a3d8396
Component: engine
2014-05-04 13:28:46 +01: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
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
96672190ed
Merge pull request #5537 from shykes/pr_out_api_server_better_error_checking_to_avoid_unnecessary_panics
...
Upstream-commit: 1c48dfebb90f1765760fbfbe0176bc34aedc47a3
Component: engine
2014-05-02 16:05:07 -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
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
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
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
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
bc81f65847
Merge pull request #5565 from creack/fix_devpts
...
Month devpts before mounting subdirs
Upstream-commit: ac7b2b888da4c9775c47c0f3139cdc2f643098a2
Component: engine
2014-05-02 14:14:46 -07:00
6ac22e7613
cli.md: Add another sudo
...
Upstream-commit: 4706a1ad76ed9bc6c0555499d0bd8b8eea3b3604
Component: engine
2014-05-02 23:13:28 +02:00
0275c825eb
cli.md: Add space
...
Upstream-commit: 12a4b376fd42931d959cd925983243e94c981de4
Component: engine
2014-05-02 22:56:35 +02:00
ac76593583
Month devpts before mounting subdirs
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: a7ccbfd5f143af8a7accc69803b1588e568328ac
Component: engine
2014-05-02 13:55:45 -07:00
c18848f023
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)
Upstream-commit: 9f152aacf8427cbd20a70d52d633f8a6d624aff5
Component: engine
2014-05-02 13:27:17 -06:00
8a4635dfd2
Merge pull request #5507 from shykes/dind-maintainer
...
Make Jerome Petazzoni a maintainer for dind
Upstream-commit: 4d521f479b4596ffa4719c1d15eb7b3f990fa2d1
Component: engine
2014-05-02 11:25:41 -07:00
1ed0224965
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)
Upstream-commit: 59fe77bfa638001cbe9af386f350d6e0dbb23398
Component: engine
2014-05-02 11:14:24 -07:00
4d667fa77e
Merge pull request #5529 from crosbymichael/restrict-proc
...
Mount /proc and /sys read-only, except in privileged containers
Upstream-commit: 1c5a3123cc6ac396656b1027504748bd8dcd65e9
Component: engine
2014-05-02 10:52:53 -07:00
d4a39f6488
cli.md: Fix up Markdown formatting by adding one `
...
Upstream-commit: 877ad96d89093af8b16112c3534f4ceceaf1b7b3
Component: engine
2014-05-02 16:53:59 +02:00
14e25e7714
Merge pull request #5501 from discordianfish/add-commit-message-bp
...
Upstream-commit: b372c19b389340962ea86e598df1faea694a4aa6
Component: engine
2014-05-01 23:47:31 -07:00
52ce474216
Merge pull request #5536 from vmarmol/add-maintainers-libcontainer
...
Upstream-commit: f4b60a385cbaae045674146644294e9c55129b3f
Component: engine
2014-05-01 23:42:50 -07:00
6e316a7be9
Apply apparmor before restrictions
...
There is not need for the remount hack, we use aa_change_onexec so the
apparmor profile is not applied until we exec the users app.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 76fa7d588adfe644824d9a00dafce2d2991a7013
Component: engine
2014-05-01 19:09:12 -07:00
