7ea0137fad
fix lxc because it doesnt have the hardened libcontainer stuff
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 52118df432353dee2a37dd284462c4c021174a50
Component: engine
2015-05-07 17:40:37 -07:00
92cec4b2c1
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
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
2015-05-07 17:13:32 -07:00
5c2686119c
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
2015-05-07 17:10:39 -07:00
3cb88baa8b
Merge pull request #11831 from cellpjs/patch-1
...
Remove mkimage-unittest.sh
Upstream-commit: 982402f4e05aa7c3e89ead8fb07b5514a1961963
Component: engine
2015-05-07 17:07:56 -07:00
9fb1f7589d
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
Upstream-commit: e03ac8d5b98f525c3d32bb5a6ac84b2c5717a0dc
Component: engine
2015-05-07 17:04:20 -07:00
d482451b94
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
Upstream-commit: f6fa579d52a446d6a8171330ddad73602c79dd30
Component: engine
2015-05-07 17:02:58 -07:00
f08d29d6d6
Merge pull request #12278 from duglin/12267-Wildcards
...
Fix for Daemon crashing when wildcards are used for COPY/ADD
Upstream-commit: d0bc0153c637f0e61207fa90b0346174cd5e92e3
Component: engine
2015-05-07 17:01:16 -07:00
3bf284f32f
Merge pull request #12318 from aarondav/best-effort-iptables-lock
...
Do our best not to invoke iptables concurrently if --wait is unsupported
Upstream-commit: d0cbaeb0d28091ce4cddd1aead79b51671529fe7
Component: engine
2015-05-07 17:00:26 -07:00
13d096f3f5
Merge pull request #12830 from Microsoft/10662-refactorforwindowsexecdriver
...
Windows: Fork execdrivers.go for Windows execdriver
Upstream-commit: 67c10e762e1227c845e098af83afe5a8faaaf8c3
Component: engine
2015-05-07 16:57:59 -07:00
0af54ca869
Merge pull request #12952 from sunyuan3/trunc
...
Verify the no-trunc option for the search operation
Upstream-commit: 0ed20135904b079a1ff8505c3247cf7ca158f826
Component: engine
2015-05-07 16:52:46 -07:00
20e9b6f15f
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
Upstream-commit: 372977148dffe11bc0fee395dfd85dc86a558999
Component: engine
2015-05-07 16:51:56 -07:00
0e34dc7fca
Merge pull request #12970 from tianon/frozen-user-images
...
Allow download-frozen-image.sh to work on user images too
Upstream-commit: 6a4c219615e10a6719bea9ef4a71e00b42fd42a1
Component: engine
2015-05-07 16:50:49 -07:00
5a7855d50e
Merge pull request #12976 from Microsoft/10662-graphfirstchange
...
Windows: First fix for graph\graph.go
Upstream-commit: d34abea15b1e82c6c1b8a3dc8ab23097a6dae953
Component: engine
2015-05-07 16:50:20 -07:00
8b63746cd9
Merge pull request #12986 from psankar/master
...
Added information about mailing lists
Upstream-commit: b1572fd0a412df86e2ac24ee8345baf9ce6762b9
Component: engine
2015-05-07 16:49:14 -07:00
eb6a693474
Merge pull request #13032 from jfrazelle/nano-nano-nano
...
add nanorc to packaged builds
Upstream-commit: 6a1f862e40001b3389970b57ea38f718d4748881
Component: engine
2015-05-07 17:35:03 -06:00
1d2b89b8ee
Merge pull request #13062 from Microsoft/10662-nativedriver
...
Fix os.MkdirAll in native driver
Upstream-commit: b4dc101d746e657ab84547ae28d41d86fb6e4d34
Component: engine
2015-05-07 16:34:31 -07:00
260671a89b
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
Upstream-commit: 404412282dc917b4e810f71a996656ebdc048b3b
Component: engine
2015-05-07 16:27:15 -07:00
159968801d
Merge pull request #13065 from tianon/fix-build-deb-tilde-expansion
...
Fix '~' expansion in build-deb... (properly this time)
Upstream-commit: b6448f25f2fda3518d36b5a49fd67064cff2c952
Component: engine
2015-05-07 16:24:33 -07:00
fd731a59d6
Merge pull request #13076 from LK4D4/fix_api_daemon_order
...
Fix api servers creation and daemon start order
Upstream-commit: b4e894236792e830b6df45f3444ff6800e571ae4
Component: engine
2015-05-07 16:23:44 -07:00
082fee9c80
Merge pull request #13073 from jfrazelle/add_1.6.1_commits
...
Add 1.6.1 commits
Upstream-commit: 23193efd930a77b4e2f9cc01bcd382bf92798c5a
Component: engine
2015-05-07 16:17:53 -07:00
a555add607
Merge pull request #13059 from burke/no-fsync-on-temp-archive
...
Remove fsync in archive.NewTempArchive
Upstream-commit: 237bd23af85dc2624e973534bca1caa8741ab8f6
Component: engine
2015-05-07 16:16:52 -07:00
78169f4021
Merge pull request #13041 from hqhq/hq_fix_checkkernel
...
update recommended kernel in checkKernel
Upstream-commit: 1efecc4c41804e6019b4d4eac17f8f386e9ee658
Component: engine
2015-05-07 16:15:12 -07:00
72be67236b
add nanorc to packaged builds
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: f66d225427d135069e1fd1e9649bc5654a0f675c
Component: engine
2015-05-07 16:10:07 -07:00
149aebf1ee
bump version back to 1.7.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 2c2f6fd2728067a5d3ab6ea393d8b5593de4bc0c
Component: engine
2015-05-07 15:42:36 -07:00
6da49015e7
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 >
Upstream-commit: 08230703fdd0f7bcd9a87a0d61d88fdf2b901e66
Component: engine
2015-05-07 15:38:02 -07:00
11a35efc9d
Bump version to 1.6.1
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
(cherry picked from commit 97cd073598275fa468fb3051952bd11002830c8e)
Conflicts:
VERSION
Upstream-commit: 5b1edfed9da4529babc23fc864b71da0440823b8
Component: engine
2015-05-07 15:01:32 -07:00
ac6f208e83
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 >
Upstream-commit: f25bbedc85e8a99c1389dbe8f48436907ce24526
Component: engine
2015-05-07 14:43:39 -07:00
f61181dd2f
Update libcontainer to 1b471834b45063b61e0aedefbb1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 2f54c1a352e23de04a4535d0fc1bd0cad66c7c15
Component: engine
2015-05-07 14:43:39 -07:00
c87ab46f22
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 >
Upstream-commit: a7a51306b1459a67da3a9cbbe8c9f80d3950c084
Component: engine
2015-05-07 14:42:23 -07:00
54739fa6d1
Mount RO for timer_stats and latency_stats in proc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 27ae108b4eda48a621afc5bf2157ef11c314a858
Component: engine
2015-05-07 14:42:23 -07:00
f9ca327070
Mount /proc/fs as readonly
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 42c8c1b0b884c91efa518568181d276afd9d866f
Component: engine
2015-05-07 14:42:23 -07:00
50f626562d
Prevent write access to /proc/asound
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
integration-cli/docker_cli_run_test.go
Upstream-commit: d87da59c79eabb794087f731d3ad51ea98f7a3cc
Component: engine
2015-05-07 14:42:23 -07:00
2ee6387cbc
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
2015-05-07 14:01:16 -07:00
cba2f6d1b5
Merge pull request #13067 from burke/faster-commit-for-overlay
...
overlay: skip superfluous metadata sets on commit
Upstream-commit: 93536cfa76fe57b8bc319c747596be935b385871
Component: engine
2015-05-07 13:58:46 -07:00
a3a2746534
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
Upstream-commit: e712b60e806cd05adeb885f7dcc3098f0418de0d
Component: engine
2015-05-07 13:52:51 -07:00
52156c89d6
Merge pull request #13061 from tianon/install-update-message
...
Update "install.sh" warning to be more verbose
Upstream-commit: 2aa09b4f86f0424553f7172dfd3237874a8feb2a
Component: engine
2015-05-07 13:38:27 -07:00
0dfa2f6043
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 >
Upstream-commit: fc9ff248c1ccb586297419336b6ad5da640f2bd5
Component: engine
2015-05-07 14:20:40 -06:00
0b0c4b0dfa
overlay: skip superfluous metadata sets on commit
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: bc5503f46bdc0816d90d99bd516afaa81717346a
Component: engine
2015-05-07 16:15:54 -04:00
52ea26d7d6
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 >
Upstream-commit: 24d98c14a0ee580018fdfcc465a76fd4a976e40f
Component: engine
2015-05-07 14:15:35 -06:00
23e06861d0
Fix '~' expansion in build-deb... (properly this time)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 297cd347a676a79dee94509de7669919a4d9fab3
Component: engine
2015-05-07 14:02:21 -06:00
91089ecbb8
Fix os.MkdirAll in native driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 390f3c99d3a6fd5e9802a675a7c1618d40e3af26
Component: engine
2015-05-07 12:09:30 -07:00
4d8c51b323
Don't fsync on V2 registry push tempfile creation
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: ec66daebc2087b9bab832c973f1bd7f8a6d1a5f4
Component: engine
2015-05-07 14:49:38 -04:00
5f4fd66d05
Merge pull request #13050 from SvenDowideit/dhe-docs-update
...
DHE documentation update sync.
Upstream-commit: 1e6565188d9fa6f13aa11b7f76e60c23fcf0082b
Component: engine
2015-05-07 11:43:04 -07:00
a1c865c350
Merge pull request #13058 from bharaththiruveedula/13057-remove-SetDaemon-method
...
Removing the SetDaemon method
Upstream-commit: 1ab875b38b012bca8ae1efc534ac5170b77024ea
Component: engine
2015-05-07 10:41:41 -07:00
8c72f57c04
Merge pull request #13044 from jpopelka/link-add
...
Fix firewalld callback.
Upstream-commit: 4f25f21a973012b8d780e1d907cf32682a9e0d14
Component: engine
2015-05-07 10:34:34 -07:00
aae3d1533f
Merge pull request #12966 from cpuguy83/cleanup_the_lxc_cleanup
...
Cleanup container reg for lxc special case
Upstream-commit: 3d2cd92b2d7229b2088f2f03ed46cf039361a6f6
Component: engine
2015-05-07 10:19:46 -07:00
7d4cfe310d
Merge pull request #12965 from tianon/libcontainer-logrus
...
Update libcontainer and make it the source of truth on logrus version
Upstream-commit: db26564864f5ef1f2402792ad8dd22bb62b3570c
Component: engine
2015-05-07 10:10:28 -07:00
f128089535
Remove Sync() call in NewTempArchive:
...
This makes the "Buffering to disk" part of `docker push` 70% faster in
my use-case (having already applied #12833 ).
fsync'ing here serves no valuable purpose: if the drive's operation is
interrupted, so it the program's, and this archive has no value other
than the immediate and transient one.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
Upstream-commit: 236dbc2e59f5b665f9fa30f3f7ba1fe6c8483b24
Component: engine
2015-05-07 12:58:12 -04:00
0a2accc995
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
Upstream-commit: 94def48878294ff3b35f8724343b14e2c48a09f8
Component: engine
2015-05-07 22:25:13 +05:30
b9064ad316
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
Upstream-commit: d78755d15972fd1d3115d9927932f82bc09483df
Component: engine
2015-05-07 09:38:59 -07:00
