47fbe76a7e
Merge pull request #13077 from duglin/MoveCommands
...
Make list of commands for help less static
2015-05-07 17:35:54 -07:00
6b6a26c769
Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode
...
add support --net=container with --mac-address, --add-host error out
2015-05-07 17:13:32 -07:00
de32f5c431
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
2015-05-07 17:10:39 -07:00
982402f4e0
Merge pull request #11831 from cellpjs/patch-1
...
Remove mkimage-unittest.sh
2015-05-07 17:07:56 -07:00
e03ac8d5b9
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
2015-05-07 17:04:20 -07:00
f6fa579d52
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
2015-05-07 17:02:58 -07:00
d0bc0153c6
Merge pull request #12278 from duglin/12267-Wildcards
...
Fix for Daemon crashing when wildcards are used for COPY/ADD
2015-05-07 17:01:16 -07:00
d0cbaeb0d2
Merge pull request #12318 from aarondav/best-effort-iptables-lock
...
Do our best not to invoke iptables concurrently if --wait is unsupported
2015-05-07 17:00:26 -07:00
67c10e762e
Merge pull request #12830 from Microsoft/10662-refactorforwindowsexecdriver
...
Windows: Fork execdrivers.go for Windows execdriver
2015-05-07 16:57:59 -07:00
0ed2013590
Merge pull request #12952 from sunyuan3/trunc
...
Verify the no-trunc option for the search operation
2015-05-07 16:52:46 -07:00
372977148d
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
2015-05-07 16:51:56 -07:00
6a4c219615
Merge pull request #12970 from tianon/frozen-user-images
...
Allow download-frozen-image.sh to work on user images too
2015-05-07 16:50:49 -07:00
d34abea15b
Merge pull request #12976 from Microsoft/10662-graphfirstchange
...
Windows: First fix for graph\graph.go
2015-05-07 16:50:20 -07:00
b1572fd0a4
Merge pull request #12986 from psankar/master
...
Added information about mailing lists
2015-05-07 16:49:14 -07:00
b919dee834
Update "hack/vendor.sh" to be more explicit
...
Previously, we've taken advantage of the fact that libcontainer's `update-vendor.sh` is the same syntax as Docker's `vendor.sh` with some shell magic. This changes that to copy libcontainer's dependencies into this file explicitly so that we can scale to more projects with varying methods of vendoring (assuming they don't use import re-writing, which screws up everyone).
We'll need to stay diligent in making sure this list matches what's in libcontainer's `update-vendor.sh` (minus the not-required codegangsta/cli dep), but that's a fair trade-off for being able to scale our dependency model better (and track new discrete dependencies more directly).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-07 17:43:11 -06:00
6a1f862e40
Merge pull request #13032 from jfrazelle/nano-nano-nano
...
add nanorc to packaged builds
2015-05-07 17:35:03 -06:00
b4dc101d74
Merge pull request #13062 from Microsoft/10662-nativedriver
...
Fix os.MkdirAll in native driver
2015-05-07 16:34:31 -07:00
404412282d
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
2015-05-07 16:27:15 -07:00
b6448f25f2
Merge pull request #13065 from tianon/fix-build-deb-tilde-expansion
...
Fix '~' expansion in build-deb... (properly this time)
2015-05-07 16:24:33 -07:00
b4e8942367
Merge pull request #13076 from LK4D4/fix_api_daemon_order
...
Fix api servers creation and daemon start order
2015-05-07 16:23:44 -07:00
4f00b1020e
Make list of commands for help less static
...
Before this PR the list of commands that were printed for the help
text was statically put into the flags.Usage() function via main.init(). This
made it impossible to modify later on when we add new commands
via plugins.
This PR moves the list of commands (name & description) into a structure
that is sorted and printed dynamically by the Usage func. This will allow
the code to add to the list of commands after the init() func is done
but before the help text is printed for the user.
This just moves code around - it should have no UX impact at all.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-07 16:22:06 -07:00
23193efd93
Merge pull request #13073 from jfrazelle/add_1.6.1_commits
...
Add 1.6.1 commits
2015-05-07 16:17:53 -07:00
237bd23af8
Merge pull request #13059 from burke/no-fsync-on-temp-archive
...
Remove fsync in archive.NewTempArchive
2015-05-07 16:16:52 -07:00
1efecc4c41
Merge pull request #13041 from hqhq/hq_fix_checkkernel
...
update recommended kernel in checkKernel
2015-05-07 16:15:12 -07:00
f66d225427
add nanorc to packaged builds
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-07 16:10:07 -07:00
2c2f6fd272
bump version back to 1.7.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-07 15:42:36 -07:00
08230703fd
Fix api servers creation and daemon start order
...
* daemon creation wasn't parallel to request buffering
* it was possible that empty volume will be created in
/var/run/docker.sock by some container
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-07 15:38:02 -07:00
5b1edfed9d
Bump version to 1.6.1
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
(cherry picked from commit 97cd073598275fa468fb3051952bd11002830c8e)
Conflicts:
VERSION
2015-05-07 15:01:32 -07:00
f25bbedc85
Allow libcontainer to eval symlink destination
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Add tests for mounting into /proc and /sys
These two locations should be prohibited from mounting volumes into
those destinations.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:43:39 -07:00
2f54c1a352
Update libcontainer to 1b471834b45063b61e0aedefbb1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:43:39 -07:00
a7a51306b1
Mask reads from timer_stats and latency_stats
...
These files in /proc should not be able to be read as well
as written to.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:42:23 -07:00
27ae108b4e
Mount RO for timer_stats and latency_stats in proc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:42:23 -07:00
42c8c1b0b8
Mount /proc/fs as readonly
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:42:23 -07:00
d87da59c79
Prevent write access to /proc/asound
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
integration-cli/docker_cli_run_test.go
2015-05-07 14:42:23 -07:00
74bfa36753
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
2015-05-07 14:01:16 -07:00
93536cfa76
Merge pull request #13067 from burke/faster-commit-for-overlay
...
overlay: skip superfluous metadata sets on commit
2015-05-07 13:58:46 -07:00
e712b60e80
Merge pull request #13068 from tianon/swap-builder-verbosity
...
Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted
2015-05-07 13:52:51 -07:00
2aa09b4f86
Merge pull request #13061 from tianon/install-update-message
...
Update "install.sh" warning to be more verbose
2015-05-07 13:38:27 -07:00
fc9ff248c1
Update "install.sh" warning to be more verbose
...
See https://github.com/docker/docker/issues/12395#issuecomment-99941300 for some of the context on this one.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-07 14:20:40 -06:00
bc5503f46b
overlay: skip superfluous metadata sets on commit
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
2015-05-07 16:15:54 -04:00
24d98c14a0
Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted
...
Also, `curl` is smart enough to see when the consumer of the pipe is going slow that it should slow down the transfer, so this gives a reasonable indication of extraction progress too.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-07 14:15:35 -06:00
297cd347a6
Fix '~' expansion in build-deb... (properly this time)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-07 14:02:21 -06:00
390f3c99d3
Fix os.MkdirAll in native driver
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-07 12:09:30 -07:00
80d73c838a
Test Cases for API - Container create with Hostname, DomainName and NetworkMode
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-07 21:03:39 +02:00
ec66daebc2
Don't fsync on V2 registry push tempfile creation
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
2015-05-07 14:49:38 -04:00
1e6565188d
Merge pull request #13050 from SvenDowideit/dhe-docs-update
...
DHE documentation update sync.
2015-05-07 11:43:04 -07:00
1ab875b38b
Merge pull request #13058 from bharaththiruveedula/13057-remove-SetDaemon-method
...
Removing the SetDaemon method
2015-05-07 10:41:41 -07:00
4f25f21a97
Merge pull request #13044 from jpopelka/link-add
...
Fix firewalld callback.
2015-05-07 10:34:34 -07:00
3d2cd92b2d
Merge pull request #12966 from cpuguy83/cleanup_the_lxc_cleanup
...
Cleanup container reg for lxc special case
2015-05-07 10:19:46 -07:00
db26564864
Merge pull request #12965 from tianon/libcontainer-logrus
...
Update libcontainer and make it the source of truth on logrus version
2015-05-07 10:10:28 -07:00
Jessie Frazelle
Tianon Gravi
David Calavera
Doug Davis
Jessica Frazelle
Alexander Morozov
Michael Crosby
Alexander Morozov
Burke Libbey
John Howard
Rajdeep Dua
Fred Lifton
Michael Crosby