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
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
2d3c25cbdc
Merge pull request #13037 from runcom/12607-no-strconv-atoi-err-check
...
Do not check and return strconv.Atoi error in api container restart
Upstream-commit: a38d6b575511d233be049964cec0411ff6beec81
Component: engine
2015-05-07 09:29:10 -07:00
e580063058
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 68e9c07850c95ded1e0a8adda39a8efe68e1c0ee
Component: engine
2015-05-07 15:43:50 +00:00
c26d05add9
DHE documentation update
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 59bfee2fa4f178660fa4cb2a9d18c924e86595a7
Component: engine
2015-05-07 20:38:46 +10:00
860e8ba926
Fix firewalld callback.
...
It needs to be called with same args as the one 4 lines above.
Signed-off-by: Jiri Popelka <jpopelka@redhat.com >
Upstream-commit: 6e8cfd63fcbf6d64b475b387cc66689582cc81c1
Component: engine
2015-05-07 10:08:49 +02:00
6284ff4960
Merge pull request #13038 from tianon/fix-build-deb
...
Fix build-deb
Upstream-commit: 443437f5ea04da9d62bf3e05d7951f7d30e77d96
Component: engine
2015-05-06 22:12:15 -07:00
f36df344d5
Cleanup container reg for lxc special case
...
The lxc code here is doing the exact same thing on calling
execdriver.Terminate, so let's just use that.
Also removes some dead comments originally introduced
50144aeb42283848db730b936d6b5b6332ec6565 but no longer relevant since we
have restart policies.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 44cd599e29451647492b3a5341ba23252a69ca27
Component: engine
2015-05-06 23:01:46 -04:00
fcf8de1fe6
update recommended kernel in checkKernel
...
We already changed docs: https://github.com/docker/docker/pull/10652
Should change code as well.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: ceae5f54b3abe805b3323476dafb00595b064ed2
Component: engine
2015-05-07 10:11:02 +08:00
35594b63f9
Merge pull request #13036 from SvenDowideit/update-docker-hub-repo-documentation
...
Add a userguide to cover the uses of Hub before creating new reposito…
Upstream-commit: a1aff84480971b73046b5d1ea572d860f0aa94ea
Component: engine
2015-05-06 18:02:23 -07:00
319058a95b
Add a userguide to cover the uses of Hub before creating new repositories
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 9da3a848abea56dff960baa8428dc073b70ec1de
Component: engine
2015-05-07 00:31:04 +00:00
5b2c5b9ceb
Merge pull request #13034 from icecrime/remove_insert_instruction
...
Remove unused Dockerfile instruction INSERT
Upstream-commit: a592dce97b98a33dd703308fb9fd1598798aef4d
Component: engine
2015-05-06 20:12:50 -04:00
a1ac14178e
Fix build-deb
...
This fixes the part of #12996 that I forgot. 👼
This also fixes a minor path issue (there's no `libexec` in Debian), and fixes a minor bug with the `debVersion` parsing.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 867eed8f3586c81b32dc9f85208692e9e1c9909a
Component: engine
2015-05-06 18:10:15 -06:00
e90b34218e
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 74121a42118750e560e772a3fee33e9d7bd903d0
Component: engine
2015-05-07 01:49:16 +02:00
d7923211b9
Remove unused Dockerfile instruction INSERT
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 596e91638cbe8b583dff4fdfc5a52e9d3840b20f
Component: engine
2015-05-06 16:26:43 -07:00
51100e4c20
Merge pull request #13033 from icecrime/12715_carry
...
Logs with follow=1 immediately send HTTP response
Upstream-commit: 4b4adae41c33da727b2d6be97f2257e169841ff8
Component: engine
2015-05-06 15:42:48 -07:00
ef04d9cd3c
Merge pull request #12980 from Microsoft/10662-filepathimageimage
...
Windows: Fix filepath vs path in image.go
Upstream-commit: f65e65b0c93bedfb8878d6366161a4f8e726eb8b
Component: engine
2015-05-06 15:02:10 -07:00
61b5e9a5f1
Merge pull request #12977 from Microsoft/10662-graphloadfilepath
...
Windows: Filepath in graph\load.go
Upstream-commit: 7d38d33f018a96bde5d08ae09628d4444b0aee26
Component: engine
2015-05-06 15:01:49 -07:00
