23dd221e52
sync the initial docs from b2d
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-30 11:16:38 +10:00
107cd5dd5f
Merge pull request #6109 from unclejack/block_aufs_on_top_of_btrfs
...
block aufs on incompatible file systems
2014-05-29 16:58:30 -07:00
e8a87120d4
block aufs on incompatible file systems
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-30 02:32:27 +03:00
a86975f29b
Merge pull request #6048 from crquan/use-timeout-conn
...
Use Timeout Conn wrapper to set read deadline for downloading layer
2014-05-29 15:23:21 -07:00
887ab77922
Merge pull request #6096 from vishh/stats_strongtype
...
Replaced fs.Stats() interface with fs.GetStats() which returns a cgroups.Stats strong type
2014-05-29 15:23:01 -07:00
72e6e5ff7e
Added a new method cgroups.GetStats() which will return a cgroups.Stats object which will contain all the available cgroup Stats.
...
Remove old Stats interface in libcontainers cgroups package.
Changed Stats to use unit64 instead of int64 to prevent integer overflow issues.
Updated unit tests.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-05-29 20:16:49 +00:00
189c600b3b
Merge pull request #6105 from gdm85/master
...
Do not consider iptables' output an error in case of xtables lock
2014-05-29 11:06:25 -07:00
e2935f9c16
Merge pull request #6106 from discordianfish/improve-error-btrfs-on-non-btrfs
...
Add ErrPrerequisites to improve misleading errors
2014-05-29 11:00:13 -07:00
f65f1660c0
Merge pull request #6098 from crosbymichael/retry-mount
...
Handle EBUSY on remount
2014-05-29 09:18:54 -07:00
75754e69f6
Add ErrPrerequisites to improve misleading errors
...
There are two cases where we can't use a graphdriver:
1) the graphdriver itself isn't supported by the system
2) the graphdriver is supported by some configuration/prerequisites are
missing
This introduces a new error for the 2) case and uses it when trying to
run docker with btrfs backend on a non-btrfs filesystem.
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
2014-05-29 17:09:55 +02:00
5e3b643ce6
* do not consider iptables' output an error in case of xtables lock
...
Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com> (github: gdm85)
2014-05-29 15:57:29 +02:00
8622641b58
Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images
...
docs/installation/google: update to use container-vm images
2014-05-29 11:41:43 +10:00
456ba11d89
docs/installation/google: update to use container-vm images
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-29 11:36:28 +10:00
b9619bf957
Merge pull request #6099 from SvenDowideit/pr_out_updated_documentation_for_mentioning_images_vs_containers
...
updated documentation for mentioning images vs containers
2014-05-29 11:23:53 +10:00
a0505edc9a
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-29 11:20:41 +10:00
5d04b9deaf
Handle EBUSY on remount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-28 18:10:50 -07:00
b204b97c9a
Merge pull request #6083 from bernerdschaefer/nsinit-drop-capabilities-after-changing-user
...
SETUID/SETGID not required for changing user
2014-05-28 17:29:17 -07:00
341a2b85be
Merge pull request #5402 from SvenDowideit/dont-update-authors
...
Don't add yourself to the AUTHORs file - its generated
2014-05-29 02:00:29 +03:00
745445ebb7
Merge pull request #6067 from SvenDowideit/go-fmt-s
...
gofmt does not result in the same thing as go fmt -s, which is what travis uses
2014-05-29 01:58:03 +03:00
a8131c7354
Merge pull request #6090 from alexlarsson/fix-console
...
Fix /dev/console
2014-05-29 01:09:33 +03:00
7f5cd76824
libcontainer: Don't create a device node on /dev/console to bind mount on
...
There is no need for this, the device node by itself doesn't work, since
its not on a devpts fs, and we can just a regular file to bind mount over.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-05-28 21:07:40 +02:00
35d08bdd01
Revert "Remove the bind mount for dev/console which override the mknod/label"
...
This reverts commit ae85dd5458
2014-05-28 21:07:27 +02:00
2330be2adc
Merge pull request #6076 from LK4D4/remove_collections_package
...
Remove collections package
2014-05-28 21:32:27 +03:00
5e2af07137
Merge pull request #5868 from jhspaybar/5749-libcontainerroutes
...
libcontainer support for arbitrary route table entries
2014-05-28 10:50:56 -07:00
bf7f360dca
Fixes #5749
...
libcontainer support for arbitrary route table entries
Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com> (github: jhspaybar)
2014-05-28 17:42:02 +00:00
0563453b91
SETUID/SETGID not required for changing user
...
It is no longer necessary to pass "SETUID" or "SETGID" capabilities to
the container when a "user" is specified in the config.
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
2014-05-28 16:41:48 +02:00
fd58524f81
Add system.SetKeepCaps and system.ClearKeepCaps
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
2014-05-28 16:40:36 +02:00
f00c2e5007
Merge pull request #5957 from cgwalters/manpage-typo
...
docker-run.1: Fix typo 'priviledged'
2014-05-28 22:43:46 +10:00
31f0a61a3d
Remove collections package
...
It doesn't needed anymore аfter port and ip allocators refactoring
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4dmath@gmail.com> (github: LK4D4)
2014-05-28 13:59:45 +04:00
02f4ae6c56
Use Timeout Conn wrapper to set read deadline for downloading layer
...
Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
2014-05-27 22:50:04 -07:00
77ae37a383
Merge pull request #6068 from jpetazzo/update-wording-private-self-hosted-registries
...
Replace 'private' with 'self-hosted' in a couple of places
2014-05-28 14:39:05 +10:00
e56cf35c29
Merge pull request #6069 from crosbymichael/dm-errors
...
Return devmapper errors with additional text
2014-05-27 19:15:59 -07:00
6964012382
Return devmapper errors with additional text
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-27 19:03:57 -07:00
b64535166f
Replace 'private' with 'self-hosted' in a couple of places
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
2014-05-27 18:57:25 -07:00
147ad3480d
gofmt does not result in the same thing as go fmt -s file.go, which is what travis tests for
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-28 11:11:47 +10:00
d53eb2f67c
Merge pull request #6053 from jamtur01/produpdate
...
Removed Docker production warnings
2014-05-27 18:00:49 -07:00
58a0e8af8a
Merge pull request #6044 from zdover23/27May_dockerfile_2
...
27 may dockerfile 2
2014-05-28 07:58:02 +10:00
b76302e5d9
Merge pull request #6040 from SvenDowideit/installer-docs
...
Rewrite the mac and windows docs to use the boot2docker installers.
2014-05-28 07:57:43 +10:00
5f5d66ade6
Rewrite the mac and windows docs to use the boot2docker installers.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-28 07:56:15 +10:00
080d8a7a83
Merge pull request #6005 from jimperrin/master
...
Updated documentation to include CentOS installation instructions.
2014-05-28 07:55:03 +10:00
70c6d806c8
Merge pull request #6063 from vieux/improve_number_detection
...
improve numeric only id detection
2014-05-28 00:36:57 +03:00
b8a89ba963
Merge pull request #6062 from crosbymichael/update-waits
...
Update wait calls to call Wait on Command
2014-05-27 14:17:19 -07:00
f2baa364a1
improve numeric only id detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-27 21:03:12 +00:00
5310e8575f
Update lxc to use cmd.Wait()
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-27 13:52:05 -07:00
b9de22e828
Update wait calls to call Wait on Command
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-27 13:38:24 -07:00
a605379927
Merge pull request #6059 from erikh/fix-tests
...
Fix race condition in CLI tests: diff was not acquiring a container lock
2014-05-27 13:19:32 -07:00
0d9a5ce6dd
Merge pull request #6025 from crosbymichael/concurrent-names
...
Improve name generation on concurrent requests
2014-05-27 23:18:19 +03:00
88cefe20b4
Merge pull request #6030 from erikh/5971-fix-zombies
...
Add Wait() calls in the appropriate spots
2014-05-27 12:53:17 -07:00
8b77e0183e
Fix race condition in CLI tests: diff was not acquiring a container lock
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-05-27 12:28:31 -07:00
b01c3283fa
libcontainer/nsinit: remove Wait call from Exec and Kill from Attach in tty_term.go
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-05-27 12:26:56 -07:00
SvenDowideit
Michael Crosby
unclejack
Vishnu Kannan
Victor Marmol
Johannes 'fish' Ziemke
Giuseppe Mazzotta
Sven Dowideit
Johan Euphrosine
Robin Speekenbrink
Michael Crosby
Victor Vieux
unclejack
Alexander Larsson
William Thurston
Bernerd Schaefer
Alexandr Morozov
Derek
Jérôme Petazzoni
O.S. Tezer
Victor Vieux
Erik Hollensbe