f6f7d35248
Restore the stripped registry version number
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-05-27 15:15:47 -07:00
b4a52fc4e9
doc cli lint.
...
- 79 char line length (non-command).
- Consistent single space between sentences.
- Replace start of line tabs with spaces.
- Remove trailing white space.
- Consistent "**Note:**" style.
https://docs.docker.com/project/doc-style/#notes
- Replace the ``` sections with indented code.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
2015-05-27 15:07:57 -07:00
ec471a7c9b
Merge pull request #12572 from jfrazelle/selinux-labels-carry
...
Modify volume mounts SELinux labels on the fly based on :Z or :z
2015-05-27 14:46:16 -07:00
b2a43baf2e
Use SELinux labels for volumes
...
Fixes a regression from the volumes refactor where the vfs graphdriver
was setting labels for volumes to `s0` so that they can both be written
to by the container and shared with other containers.
When moving away from vfs this was never re-introduced.
Since this needs to happen regardless of volume driver, this is
implemented outside of the driver.
Fixes issue where `z` and `Z` labels are not set for bind-mounts.
Don't lock while creating volumes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-27 13:43:38 -07:00
f5d3311839
Merge pull request #13449 from duglin/FixRaceInStop
...
Fix race condition on container stop
2015-05-27 13:05:53 -07:00
af7d17a6c9
apply selinux labels volume patch on volumes refactor
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-27 12:50:16 -07:00
160dc79db0
Modify volume mounts SELinux labels on the fly based on :Z or :z
...
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-27 12:50:16 -07:00
7b57fae046
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
2015-05-27 10:44:57 -07:00
26650e2ccc
Merge pull request #13483 from jfrazelle/lxc-we-meet-again
...
fix lxc tests unshare, they dont use our apparmor profile
2015-05-27 10:22:31 -07:00
b29f3bb1c3
Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil
...
Return err if we got err on parseForm
2015-05-27 12:38:53 -04:00
2029257e3c
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
2015-05-27 08:44:11 -07:00
f3e56420a3
Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe
...
Fix unregister stats on when rm running container
2015-05-27 11:10:36 -04:00
3f66f6f2f0
Merge pull request #13500 from HuKeping/cleanup
...
Remove unused code
2015-05-27 13:59:40 +02:00
a34cb32186
Remove unused code
...
As far as I see, it's a dead code.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-27 22:39:02 +08:00
94d604357f
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-27 18:25:57 +08:00
7c7aebfcfe
Return err if we got err on parseForm
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-27 18:16:28 +08:00
f228fb09ac
script cleaned up
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-05-27 10:21:09 +03:00
b3e8ab3021
Fix unregister stats on when rm running container
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-26 22:22:03 -04:00
e580734149
Merge pull request #13406 from moxiegirl/experimental-work
...
Placeholder Part II: For commenting about install
2015-05-26 18:19:26 -07:00
bdb77078b5
Ensure all the running containers are killed on daemon shutdown
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-27 09:09:25 +08:00
04f99a6ca8
Fix container unmount networkMounts
...
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-05-26 17:38:26 -07:00
b50e780925
Merge pull request #13491 from jfrazelle/revert-exec-privileged
...
Revert "Add docker exec run a command in privileged mode"
2015-05-26 16:41:50 -07:00
838e1a8947
Merge pull request #13487 from calavera/volume_load_regression_test
...
Add regression test to make sure we can load old containers with volumes.
2015-05-26 19:40:08 -04:00
54b514735c
Merge pull request #12881 from nakedible/patch-1
...
Prevent fallback to v1 registry for digest pulls
2015-05-26 19:24:37 -04:00
041ba90dbb
Windows: Set default exec driver to windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 16:17:33 -07:00
1ba1a0550f
Fixes title, line wrap, and Adds install area
...
Tibor's comment
Updating with the new plugins
Entering comments from Seb
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-26 15:37:38 -07:00
0d445685b8
Merge pull request #13444 from runcom/fix-race-stats
...
Fix race in stats cli and native driver
2015-05-26 15:34:50 -07:00
ea0e15ba62
Add regression test to make sure we can load old containers with volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-26 15:28:58 -07:00
bd18d86250
Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup
...
Do not force `syscall.Unmount` on container cleanup.
2015-05-26 15:23:16 -07:00
f78dce152c
Do not force `syscall.Unmount` on container cleanup.
...
This is not necessary and it's a regression from the old behavior.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-26 14:28:26 -07:00
de318d8c1d
Merge pull request #13489 from cpuguy83/cleanup_rm_funcs
...
Cleanup container rm funcs
2015-05-26 14:24:02 -07:00
40b71adee3
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5
2015-05-26 14:12:16 -07:00
47e727d1fc
Merge pull request #13440 from LK4D4/fix_bridge_none
...
Fix network with -b none
2015-05-26 14:08:21 -07:00
3b795e035b
Merge pull request #13409 from LK4D4/add_opts_to_checkconfig
...
Add some opts to checkconfig
2015-05-26 13:54:23 -06:00
4509f91b26
Update vendored libcontainer to v2.1
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
2015-05-26 12:47:57 -07:00
f8628ba891
Cleanup container rm funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-26 15:38:52 -04:00
c19962ade1
Allow mirroring only for the official index
...
Strip authconfig from session to keep credentials from being sent to the mirror.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-05-26 11:08:19 -07:00
13deed3801
Registry v2 mirror support.
...
The v2 registry will act as a pull-through cache, and needs to be
handled differently by the client to the v1 registry mirror.
See docker/distribution#459 for details
Configuration
Only one v2 registry can be configured as a mirror. Acceptable configurations
in this chanage are: 0...n v1 mirrors or 1 v2 mirror. A mixture of v1 and v2
mirrors is considered an error.
Pull
If a v2 mirror is configured, all pulls are redirected to that mirror. The
mirror will serve the content locally or attempt a pull from the upstream mirror,
cache it locally, and then serve to the client.
Push
If an image is tagged to a mirror, it will be pushed to the mirror and be
stored locally there. Otherwise, images are pushed to the hub. This is
unchanged behavior.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-05-26 11:08:19 -07:00
fc679bebb9
Merge pull request #13479 from Microsoft/10662-fixcontaineragain
...
Windows: Fix up container again
2015-05-26 10:49:48 -07:00
7853bd29ec
Merge pull request #13480 from Microsoft/10662-fixvolumecompile
...
Windows: Fix volume_windows compile
2015-05-26 10:32:44 -07:00
a08fb73f93
fix lxc tests unshare, they dont use our apparmor profile
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-26 10:31:21 -07:00
1dc0499b64
Windows: Fix volume_windows compile
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 09:43:21 -07:00
5d207de509
Windows: Fix up container again
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 09:33:55 -07:00
0fccc40307
Merge pull request #13471 from ibuildthecloud/no-nil
...
Preinitialize MountPoints to avoid assigning to a nil map
2015-05-26 12:26:49 -04:00
aee9ac302d
Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
...
add unshare apparmor profile test
2015-05-26 17:32:45 +02:00
9e00e34092
Make hack/make.sh work on FreeBSD
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-05-26 15:59:36 +03:00
9e425d56d0
Add lock before accessing native driver active containers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-26 13:55:02 +02:00
77280a87b7
Fix race in stats cli and native driver
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-26 13:55:02 +02:00
59214a0737
Preinitialize MountPoints to avoid assigning to a nil map
...
Fixes #13435
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-25 19:37:57 -07:00
628c396555
Merge pull request #13467 from epc/epc-2015145
...
Documentation Copy edits for typos
2015-05-25 14:32:17 -04:00
Richard
Lloyd Dewolf
Arnaud Porterie
Brian Goff
David Calavera
Jessica Frazelle
Dan Walsh
Alexander Morozov
Doug Davis
Phil Estes
Antonio Murdaca
Hu Keping
Qiang Huang
Alexey Guskov
moxiegirl
Lei Jitang
Josh Hawn
Tibor Vass
John Howard
Tianon Gravi
boucher
Derek McGowan
Sebastiaan van Stijn
Antonio Murdaca
Darren Shepherd
James Turnbull