43b7af1dd1
Merge pull request #6150 from LK4D4/remove_used_from_streamformatter
...
Remove unused and racy "used" param from streamformatter
2014-06-02 11:56:05 -07:00
f1a217be0f
Merge pull request #6116 from vishh/nsinit_stats
...
Adding "stats" and "spec" option to nsinit CLI
2014-06-02 11:44:37 -07:00
d3ff00948f
Merge pull request #6157 from SvenDowideit/pr_out_update_networking_md
...
Update networking.md
2014-06-02 13:46:26 -04:00
1ae37cef91
Remove unused and racy "used" param from streamformatter
...
Also tests written
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-02 21:43:07 +04:00
4ac216d8d3
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)
2014-06-03 03:41:53 +10:00
2404ce3d26
Merge pull request #6154 from SvenDowideit/pr_out_adding_user_guide
...
Adding User Guide
2014-06-02 10:39:15 -07:00
f7b82be0dd
Adding "stats" and "spec" option to nsinit binary which will print the stats and spec respectively.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-06-02 06:37:22 +00:00
a7b2c4804b
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)
2014-06-01 17:34:07 -04:00
4edcbfdeb7
Merge pull request #6140 from zanedeg/patch-1
...
Updated link to new docker-node-hello repository
2014-06-02 07:32:43 +10:00
758e23df4d
Merge pull request #5924 from SvenDowideit/docs-build-instructions
...
Add documentation build steps for the next release manager to follow.
2014-06-01 08:31:51 +10:00
953abf6ae7
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)
2014-06-01 08:31:33 +10:00
2024a0e517
Merge pull request #6089 from unclejack/docker_build_copy
...
add support for COPY to docker build
2014-06-01 01:26:31 +03:00
b51802a47c
Merge pull request #6073 from SvenDowideit/b2d-port-redirection-docs
...
sync the initial port redirection docs from b2d
2014-05-31 13:58:28 -07:00
0658868c7f
Updated link to new docker-node-hello repository
2014-05-31 14:55:59 -06:00
05cf3498a6
Merge pull request #6128 from crosbymichael/empty-sqlite
...
Init database if empty file
2014-05-31 06:56:00 +03:00
af31fe95cd
Merge pull request #6129 from crosbymichael/copy-all-in-priv
...
Ensure all dev nodes are copied for privileged
2014-05-31 06:40:20 +03:00
69989b7c06
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)
2014-05-30 18:39:11 -07:00
b0ea389c69
Init database if empty file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-30 17:44:00 -07:00
0ef637722f
Merge pull request #6097 from timthelion/consistentdevices
...
Refactor device handling code
2014-05-31 03:34:52 +03:00
efb4ebcfe8
Merge pull request #6127 from unclejack/reuse_timestamp
...
reuse timestamp, don't call time.Now() 3 times
2014-05-30 17:21:19 -07:00
b64209f7b6
reuse timestamp, don't call time.Now() 3 times
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-31 03:03:51 +03:00
8ac516094e
Merge pull request #5947 from glebfm/fix-socket-race-condition
...
Fix race condition during socket creation
2014-05-30 15:07:06 -07:00
b46449cb33
Merge pull request #6123 from vieux/no_number_default
...
no default default number in names
2014-05-31 00:55:11 +03:00
0f40cedc23
Merge pull request #6124 from vieux/standadize_debug_iptables
...
use stderr to debug iptables
2014-05-31 00:46:28 +03:00
c90faa47b6
Merge pull request #6065 from vieux/fix_race_waitlock
...
update container's state after we close the waitLock
2014-05-31 00:38:35 +03:00
5708aa62f3
use stderr to debug iptables
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-30 19:39:42 +00:00
608702b980
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 )
2014-05-30 19:21:29 +00:00
e70a5ab014
no default default number in names
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-30 19:08:21 +00:00
251de0887b
Merge pull request #6121 from unclejack/refactor_daemon_restore
...
optimize restore & use Getenv less in daemon.go
2014-05-30 11:37:12 -07:00
0fd0deb75d
optimize restore & use Getenv less in daemon.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-30 21:20:27 +03:00
9e58a77e26
Merge pull request #6118 from LK4D4/fix_race_conditions
...
Fix race conditions
2014-05-30 10:43:56 -07:00
adb639117b
Atomically increment sequence in pkg/netlink
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 16:08:29 +04:00
af17b01ad7
Goroutine-safe daemon.containers
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 16:08:06 +04:00
64bd6a6a53
Fix race in native driver on activeContainers usage
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 14:16:00 +04:00
4e5f6951f2
Fix races in set/get currentInterfaces in networkdriver
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 14:16:00 +04:00
ce9e9ff4a1
Fix race on shutting down
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 14:15:46 +04:00
c4990ab999
Fix races on TagStore accessing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 13:36:14 +04:00
838d6a9e9b
Merge pull request #5855 from philips/remove-dead-code
...
chore(graph/graph): remove dead code
2014-05-30 04:51:12 +03:00
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
Victor Vieux
Michael Crosby
James Turnbull
Alexandr Morozov
Andre Dublin
Sven Dowideit
Vishnu Kannan
SvenDowideit
unclejack
O.S. Tezer
Zane DeGraffenried
Michael Crosby
unclejack
Victor Vieux
Timothy Hobbs
Victor Marmol
Johannes 'fish' Ziemke
Giuseppe Mazzotta