071672b2fe
Update networking.md
...
grammar
Docker-DCO-1.1-Signed-off-by: Andre Dublin <81dublin@gmail.com > (github: andredublin)
rebased by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4ac216d8d3441b8546798711320cb5679d33984d
Component: engine
2014-06-03 03:41:53 +10:00
5d9995fc13
Merge pull request #6154 from SvenDowideit/pr_out_adding_user_guide
...
Adding User Guide
Upstream-commit: 2404ce3d261cd54596646f2008e0664a5e1be2cf
Component: engine
2014-06-02 10:39:15 -07:00
1b1746cd69
Adding User Guide
...
* Added User Guide section outlines.
* Added User Guide to menu.
* Moved HTTPS example to articles.
* Replaced Hello World example with User Guide.
* Moved use cases out of examples.
* Updated Introduction to add User Guide.
* Redirected migrated /use and /articles links.
* Added Docker.io section
* Added Dockerized section
* Added Using Docker section
* Added Docker Images section
* Added Docker Links section
* Added Docker Volumes section
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: a7b2c4804b2d98c2b5622db40d3d70b88529d7fe
Component: engine
2014-06-01 17:34:07 -04:00
e0357c5a9f
Merge pull request #6140 from zanedeg/patch-1
...
Updated link to new docker-node-hello repository
Upstream-commit: 4edcbfdeb7d056f47f2eba13c6e005324381ff9e
Component: engine
2014-06-02 07:32:43 +10:00
e26a29105d
Merge pull request #5924 from SvenDowideit/docs-build-instructions
...
Add documentation build steps for the next release manager to follow.
Upstream-commit: 758e23df4d8dbc0c35e70762521215a20c8a6a71
Component: engine
2014-06-01 08:31:51 +10:00
1dae3a407b
Add documentation build steps for the next release manager to follow.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 953abf6ae7b31a3563fa57a9898305018add0571
Component: engine
2014-06-01 08:31:33 +10:00
b92a4a943f
Merge pull request #6089 from unclejack/docker_build_copy
...
add support for COPY to docker build
Upstream-commit: 2024a0e517d9b5e009bd8935de60c4782cc1d17a
Component: engine
2014-06-01 01:26:31 +03:00
8ac48e81c5
Merge pull request #6073 from SvenDowideit/b2d-port-redirection-docs
...
sync the initial port redirection docs from b2d
Upstream-commit: b51802a47ce666e20e6638955d383763d99a04d7
Component: engine
2014-05-31 13:58:28 -07:00
81343783d4
Updated link to new docker-node-hello repository
...
Upstream-commit: 0658868c7f81dd225df8678f31f7ef70274d8d94
Component: engine
2014-05-31 14:55:59 -06:00
bd709c495b
Merge pull request #6128 from crosbymichael/empty-sqlite
...
Init database if empty file
Upstream-commit: 05cf3498a69c271345313ccd38b2de2ae325406f
Component: engine
2014-05-31 06:56:00 +03:00
acc8753072
Merge pull request #6129 from crosbymichael/copy-all-in-priv
...
Ensure all dev nodes are copied for privileged
Upstream-commit: af31fe95cdb69f312e544dd0310daad120671242
Component: engine
2014-05-31 06:40:20 +03:00
3248c6e81c
Ensure all dev nodes are copied for privileged
...
This also makes sure that devices are pointers to avoid copies
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 69989b7c06b0ca6737e83ddf8fcfa2dfccc57a7c
Component: engine
2014-05-30 18:39:11 -07:00
d5186289b5
Init database if empty file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b0ea389c694484c0e4907e12a9cf8ff10f80c164
Component: engine
2014-05-30 17:44:00 -07:00
bc9024a72e
Merge pull request #6097 from timthelion/consistentdevices
...
Refactor device handling code
Upstream-commit: 0ef637722f69cff931b25c75d421e231ab75af75
Component: engine
2014-05-31 03:34:52 +03:00
1b3ec5f038
Merge pull request #6127 from unclejack/reuse_timestamp
...
reuse timestamp, don't call time.Now() 3 times
Upstream-commit: efb4ebcfe8bc3ca9497a82a49e88a8dd77693841
Component: engine
2014-05-30 17:21:19 -07:00
3acef7fcd0
reuse timestamp, don't call time.Now() 3 times
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: b64209f7b6818337a90d2f04627664b5964a29ce
Component: engine
2014-05-31 03:03:51 +03:00
1f86bb208b
Merge pull request #5947 from glebfm/fix-socket-race-condition
...
Fix race condition during socket creation
Upstream-commit: 8ac516094e5b90351cbb436477f06730b1b5e38d
Component: engine
2014-05-30 15:07:06 -07:00
fc5496269e
Merge pull request #6123 from vieux/no_number_default
...
no default default number in names
Upstream-commit: b46449cb33be12efa89b740be15ae98e686ed97a
Component: engine
2014-05-31 00:55:11 +03:00
e4984ac912
Merge pull request #6124 from vieux/standadize_debug_iptables
...
use stderr to debug iptables
Upstream-commit: 0f40cedc2347432e20206e0a03594faeb251f3b1
Component: engine
2014-05-31 00:46:28 +03:00
930b30cb1b
Merge pull request #6065 from vieux/fix_race_waitlock
...
update container's state after we close the waitLock
Upstream-commit: c90faa47b66e3254521ef33eb5b2c8b99d741625
Component: engine
2014-05-31 00:38:35 +03:00
54c61632f8
use stderr to debug iptables
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 5708aa62f36eadca5ada235ca05fddeb1510c1c6
Component: engine
2014-05-30 19:39:42 +00:00
52c8a31f21
Refactor device handling code
...
We now have one place that keeps track of (most) devices that are allowed and created within the container. That place is pkg/libcontainer/devices/devices.go
This fixes several inconsistencies between which devices were created in the lxc backend and the native backend. It also fixes inconsistencies between wich devices were created and which were allowed. For example, /dev/full was being created but it was not allowed within the cgroup. It also declares the file modes and permissions of the default devices, rather than copying them from the host. This is in line with docker's philosphy of not being host dependent.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 608702b98064a4dfd70b5ff0bd6fb45d2429f45b
Component: engine
2014-05-30 19:21:29 +00:00
13006a3fdc
no default default number in names
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e70a5ab0149562609d3a16105aada365ed940cb5
Component: engine
2014-05-30 19:08:21 +00:00
c15b4adb65
Merge pull request #6121 from unclejack/refactor_daemon_restore
...
optimize restore & use Getenv less in daemon.go
Upstream-commit: 251de0887b573d6ec4764f322415e2a494256de9
Component: engine
2014-05-30 11:37:12 -07:00
1c65521b44
optimize restore & use Getenv less in daemon.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 0fd0deb75d6e38973f154c5b41c7d4e22a9c4fef
Component: engine
2014-05-30 21:20:27 +03:00
db7fb46f61
Merge pull request #6118 from LK4D4/fix_race_conditions
...
Fix race conditions
Upstream-commit: 9e58a77e2613ffc3b070f0621c7b4a305c82e0c4
Component: engine
2014-05-30 10:43:56 -07:00
95b0c9bbd6
Atomically increment sequence in pkg/netlink
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: adb639117b5c61479d65dbf8398c0fbeda1d6cad
Component: engine
2014-05-30 16:08:29 +04:00
f31e7878cf
Goroutine-safe daemon.containers
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: af17b01ad7ba0c4d243e2e234710e44a14b6dad4
Component: engine
2014-05-30 16:08:06 +04:00
57a9b63e5e
Fix race in native driver on activeContainers usage
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 64bd6a6a5342c87db7096f60365d270d0d69e9d2
Component: engine
2014-05-30 14:16:00 +04:00
bfa0c1d204
Fix races in set/get currentInterfaces in networkdriver
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 4e5f6951f2af836c3d9163c8a150298ee87468d4
Component: engine
2014-05-30 14:16:00 +04:00
39456c1da3
Fix race on shutting down
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: ce9e9ff4a101eec5632704003fae772e8762eb15
Component: engine
2014-05-30 14:15:46 +04:00
82589e5ffd
Fix races on TagStore accessing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c4990ab999d49e261c5079925f0b13ef735a729f
Component: engine
2014-05-30 13:36:14 +04:00
7ad9494701
Merge pull request #5855 from philips/remove-dead-code
...
chore(graph/graph): remove dead code
Upstream-commit: 838d6a9e9b2206ac8952f8693a7c2be8596bee4a
Component: engine
2014-05-30 04:51:12 +03:00
13f5758035
sync the initial docs from b2d
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 23dd221e5250398d4120a1f3d1bcb591923f4892
Component: engine
2014-05-30 11:16:38 +10:00
c6d059216e
Merge pull request #6109 from unclejack/block_aufs_on_top_of_btrfs
...
block aufs on incompatible file systems
Upstream-commit: 107cd5dd5f0280064c00f3e6368ac7e3b6d0261c
Component: engine
2014-05-29 16:58:30 -07:00
7903608c88
block aufs on incompatible file systems
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: e8a87120d459dfeffee5474c3253e787d38b2ac0
Component: engine
2014-05-30 02:32:27 +03:00
a608cc700f
Merge pull request #6048 from crquan/use-timeout-conn
...
Use Timeout Conn wrapper to set read deadline for downloading layer
Upstream-commit: a86975f29bf997e708401e5a15ca08a488c40ec1
Component: engine
2014-05-29 15:23:21 -07:00
ca7e9e9a58
Merge pull request #6096 from vishh/stats_strongtype
...
Replaced fs.Stats() interface with fs.GetStats() which returns a cgroups.Stats strong type
Upstream-commit: 887ab7792290879c9226e81c178ebb8628383c41
Component: engine
2014-05-29 15:23:01 -07:00
c82b5a7f36
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)
Upstream-commit: 72e6e5ff7edc9c054e154897a4c547d89c082293
Component: engine
2014-05-29 20:16:49 +00:00
35a8824c9b
Merge pull request #6105 from gdm85/master
...
Do not consider iptables' output an error in case of xtables lock
Upstream-commit: 189c600b3ba36934c074eb6769e23989ef22fda7
Component: engine
2014-05-29 11:06:25 -07:00
608e72d07a
Merge pull request #6106 from discordianfish/improve-error-btrfs-on-non-btrfs
...
Add ErrPrerequisites to improve misleading errors
Upstream-commit: e2935f9c1691efd0dbf65c8845c823fcdf9cd2e0
Component: engine
2014-05-29 11:00:13 -07:00
7f7efc2579
Merge pull request #6098 from crosbymichael/retry-mount
...
Handle EBUSY on remount
Upstream-commit: f65f1660c086946cfb5c82c9e7f61a665a7fcf7d
Component: engine
2014-05-29 09:18:54 -07:00
32c2485efa
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)
Upstream-commit: 75754e69f6cce80c34ebc72817ada0a807fd635a
Component: engine
2014-05-29 17:09:55 +02:00
ee4e3699c5
* 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)
Upstream-commit: 5e3b643ce6f43d02fc7fe88eba41d583044a2efd
Component: engine
2014-05-29 15:57:29 +02:00
6a08eb7c32
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
Upstream-commit: 8622641b585d18476f1bc26e1bb5d4298cecf78f
Component: engine
2014-05-29 11:41:43 +10:00
9e0e3e5d33
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)
Upstream-commit: 456ba11d89b52f946d293489b52508a2e270f1a7
Component: engine
2014-05-29 11:36:28 +10:00
78e6e0a137
Merge pull request #6099 from SvenDowideit/pr_out_updated_documentation_for_mentioning_images_vs_containers
...
updated documentation for mentioning images vs containers
Upstream-commit: b9619bf9579f97f006b165f39c5a31f6738e4ac7
Component: engine
2014-05-29 11:23:53 +10:00
62daf025f0
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)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
a8abe1db1c
Handle EBUSY on remount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5d04b9deafc5ce173364a24881f8e950c9430be0
Component: engine
2014-05-28 18:10:50 -07:00
d45f77737e
Merge pull request #6083 from bernerdschaefer/nsinit-drop-capabilities-after-changing-user
...
SETUID/SETGID not required for changing user
Upstream-commit: b204b97c9adbaddd5b8cef3dc53cbee2a392b936
Component: engine
2014-05-28 17:29:17 -07:00
