Jessie Frazelle
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
Jessie Frazelle
1efecc4c41
Merge pull request #13041 from hqhq/hq_fix_checkkernel
...
update recommended kernel in checkKernel
2015-05-07 16:15:12 -07:00
Jessica Frazelle
f66d225427
add nanorc to packaged builds
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-07 16:10:07 -07:00
Jessica Frazelle
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
Alexander Morozov
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
Jessica Frazelle
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
Michael Crosby
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
Michael Crosby
2f54c1a352
Update libcontainer to 1b471834b45063b61e0aedefbb1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:43:39 -07:00
Michael Crosby
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
Michael Crosby
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
Michael Crosby
42c8c1b0b8
Mount /proc/fs as readonly
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-07 14:42:23 -07:00
Michael Crosby
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
Jessie Frazelle
74bfa36753
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
2015-05-07 14:01:16 -07:00
Alexander Morozov
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
Jessie Frazelle
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
Jessie Frazelle
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
Tianon Gravi
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
Burke Libbey
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
Tianon Gravi
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
Tianon Gravi
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
John Howard
390f3c99d3
Fix os.MkdirAll in native driver
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-07 12:09:30 -07:00
Rajdeep Dua
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
Burke Libbey
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
Fred Lifton
1e6565188d
Merge pull request #13050 from SvenDowideit/dhe-docs-update
...
DHE documentation update sync.
2015-05-07 11:43:04 -07:00
Michael Crosby
1ab875b38b
Merge pull request #13058 from bharaththiruveedula/13057-remove-SetDaemon-method
...
Removing the SetDaemon method
2015-05-07 10:41:41 -07:00
Alexander Morozov
4f25f21a97
Merge pull request #13044 from jpopelka/link-add
...
Fix firewalld callback.
2015-05-07 10:34:34 -07:00
Alexander Morozov
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
David Calavera
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
Burke Libbey
236dbc2e59
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>
2015-05-07 12:58:12 -04:00
Bharath Thiruveedula
94def48878
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
2015-05-07 22:25:13 +05:30
David Calavera
d78755d159
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
2015-05-07 09:38:59 -07:00
David Calavera
a38d6b5755
Merge pull request #13037 from runcom/12607-no-strconv-atoi-err-check
...
Do not check and return strconv.Atoi error in api container restart
2015-05-07 09:29:10 -07:00
Srini Brahmaroutu
68e9c07850
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-05-07 15:43:50 +00:00
Sven Dowideit
59bfee2fa4
DHE documentation update
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-07 20:38:46 +10:00
Jiri Popelka
6e8cfd63fc
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>
2015-05-07 10:08:49 +02:00
Tianon Gravi
443437f5ea
Merge pull request #13038 from tianon/fix-build-deb
...
Fix build-deb
2015-05-06 22:12:15 -07:00
Qiang Huang
f133f11a7d
add blkio.weight support
...
We can use this to control block IO weight of a container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-07 11:55:58 +08:00
Brian Goff
44cd599e29
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
50144aeb42 but no longer relevant since we
have restart policies.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-06 23:01:46 -04:00
Qiang Huang
ceae5f54b3
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>
2015-05-07 10:11:02 +08:00
Fred Lifton
a1aff84480
Merge pull request #13036 from SvenDowideit/update-docker-hub-repo-documentation
...
Add a userguide to cover the uses of Hub before creating new reposito…
2015-05-06 18:02:23 -07:00
Sven Dowideit
9da3a848ab
Add a userguide to cover the uses of Hub before creating new repositories
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-05-07 00:31:04 +00:00
Doug Davis
a592dce97b
Merge pull request #13034 from icecrime/remove_insert_instruction
...
Remove unused Dockerfile instruction INSERT
2015-05-06 20:12:50 -04:00
Tianon Gravi
867eed8f35
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>
2015-05-06 18:10:15 -06:00
Antonio Murdaca
74121a4211
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-07 01:49:16 +02:00
Arnaud Porterie
596e91638c
Remove unused Dockerfile instruction INSERT
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-06 16:26:43 -07:00
jhowardmsft
e35b025aa6
Windows: Split ContainerExecCreate
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-06 16:19:27 -07:00
Alexander Morozov
4b4adae41c
Merge pull request #13033 from icecrime/12715_carry
...
Logs with follow=1 immediately send HTTP response
2015-05-06 15:42:48 -07:00
Alexander Morozov
f65e65b0c9
Merge pull request #12980 from Microsoft/10662-filepathimageimage
...
Windows: Fix filepath vs path in image.go
2015-05-06 15:02:10 -07:00
Alexander Morozov
7d38d33f01
Merge pull request #12977 from Microsoft/10662-graphloadfilepath
...
Windows: Filepath in graph\load.go
2015-05-06 15:01:49 -07:00
Anthony Baire
589de35651
Logs with follow=1 immediately send HTTP response
...
Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-06 14:39:45 -07:00