Commit Graph

20092 Commits

Author SHA1 Message Date
moxiegirl
424702b91a Merge pull request #15574 from diogomonica/fixing-race-on-key-backup
Fixing race condition on private key backup how-to
2015-08-14 11:26:56 -07:00
moxiegirl
ff155ce6ee Merge pull request #15576 from estesp/hows-about-a-minor-typo
Correct readability of --userland-proxy para.
2015-08-14 11:26:21 -07:00
Arnaud Porterie
28a17c8a03 Merge pull request #15491 from Microsoft/10662-fixtar
Windows: [TP3] Fixing Tar functions to support long paths.
2015-08-14 09:41:42 -07:00
Madhu Venugopal
703e2264ba Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
Notable changes include :
- #285 : Fix required for https://github.com/docker/docker/pull/12927
- #283 : Code re-architecture/tech-debt in bridge driver
- Upgraded to latest Netlink library
- Fixed certain race-conditions

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-08-14 05:57:47 -07:00
Rory Hunter
60d97a4a63 Make run and rmi bash completions configurable
Allow the user to configure how Docker's bash completion works for the
"events", "history", "inspect", "run", "rmi" and "save" commands through the
following environment variables:

DOCKER_COMPLETION_SHOW_IMAGE_IDS
  "none" - Show names only (default)
  "non-intermediate" - Show names and ids, but omit intermediate image IDs
  "all" - Show names and ids, including intermediate image IDs

DOCKER_COMPLETION_SHOW_TAGS
  "yes" - include tags in completion options (default)
  "no"  - don't include tags in completion options

Fixes #9474.

Signed-off-by: Rory Hunter <roryhunter2@gmail.com>
2015-08-14 11:29:29 +01:00
Qiang Huang
6c4d4c70c6 Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
Fixes: #15572

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-14 14:38:48 +08:00
Arnaud Porterie
693ff58cd2 Merge pull request #14758 from Microsoft/10662-pipestohcs
Windows: [TP3] new hcsshim stdin/out/err handling
2015-08-13 22:52:48 -07:00
John Howard
4b933dd2ea Windows: Stop commit on running container
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-13 22:17:03 -07:00
Phil Estes
4e53e80934 Correct readability of --userland-proxy para
Was reading this to explain it to someone and noticed the missing "s"
which makes it not so great for nice English readability..

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2015-08-13 23:56:42 -04:00
Diogo Monica
fbb268c12a Fixing race condition on private key backup how-to
Signed-off-by: Diogo Monica <diogo@docker.com>
2015-08-13 19:16:00 -07:00
David Calavera
54b50479af Merge pull request #15065 from calavera/new_release_branch_workflow
Make the release process more atomic between major releases.
2015-08-13 16:10:11 -07:00
Jessie Frazelle
b93d99b25d Merge pull request #15545 from LK4D4/refactor_pullv2
Refactoring of pullV2Tag
2015-08-13 15:52:14 -07:00
Jessie Frazelle
46d9fd6a11 Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc
Tiny fix for rpm and deb descriptions
2015-08-13 15:04:50 -07:00
John Starks
ec5a73d18e Windows: new hcsshim stdin/out/err handling
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-13 13:09:42 -07:00
Vincent Batts
4ce24eb73a vendor: update tar-split to v0.9.6
Fixes rare edge case of handling GNU LongLink and LongName entries.
Perf improvements. /dev/null writes were taking CPU time during docker
push. Thanks @LK4D4
Various cleanup too.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-08-13 15:42:01 -04:00
Eric Windisch
7342d59114 AppArmor: Deny w to /proc/* files
Introduce a write denial for files at the root of /proc.

This prohibits root users from performing a chmod of those
files. The rules for denials in proc are also cleaned up,
making the rules better match their targets.

Locally tested on:
- Ubuntu precise (12.04) with AppArmor 2.7
- Ubuntu trusty (14.04) with AppArmor 2.8.95

Signed-off-by: Eric Windisch <eric@windisch.us>
2015-08-13 15:39:25 -04:00
Sebastiaan van Stijn
c6c195a465 Merge pull request #13501 from vdemeester/8048-image-repository-tag
Fix #8048 : make `docker images repository:tag` work
2015-08-13 21:36:21 +02:00
Alexander Morozov
9b2426c606 Refactoring of pullV2Tag
* use downloadInfo pointers everywhere
* use downloads slice only for things that we really download
* cleanup tmp files in all cases

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-13 11:50:19 -07:00
Sebastiaan van Stijn
599b76000d Merge pull request #15560 from docker/patch-bad-formatting
Fixing bad formatting reported by David via email
2015-08-13 20:26:05 +02:00
Jessie Frazelle
355f640d4d Merge pull request #15559 from liusdu/liusdu-type
fix a typo in graph/graph.go
2015-08-13 09:33:00 -07:00
Jessie Frazelle
53812e51f4 Merge pull request #15563 from ankushagarwal/changelog
Add 1.8.1 CHANGELOG
2015-08-13 09:28:31 -07:00
Ankush Agarwal
4ac8fd98b3 Add 1.8.1 CHANGELOG
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-08-13 09:02:04 -07:00
Sebastiaan van Stijn
6b1b1ad31c Merge pull request #15451 from liubin/liubin/fix-broken-link
fix broken link to wiki
2015-08-13 17:03:41 +02:00
moxiegirl
68a4beeba4 Merge pull request #15554 from HuKeping/docs-notary
Docs: some fix about notarysandbox
2015-08-13 07:47:35 -07:00
bin liu
f6753cd963 fix broken link to glossary page.
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-08-13 22:40:20 +08:00
moxiegirl
ef453f7118 Fixing bad formatting reported by David via email
Fixed and tested

Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-13 06:42:26 -07:00
Liu Hua
883fcfe425 fix a typo in graph/graph.go
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
2015-08-13 20:01:43 +08:00
Zhang Wei
7e420ad850 fix golint warnings/errors on pkg/system and pkg/stdcopy
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-08-13 18:47:13 +08:00
Hu Keping
79aac6584d Docs: some fix about notarysandbox
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-08-13 16:53:05 +08:00
Vincent Demeester
4fb88d2e11 Fix #8048 : make docker images repository:tag work
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.

Closes #8048.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-13 08:50:09 +02:00
Tim Dettrick
90326939c8 Updated test to check for exec --privileged side-effects
Also improving documentation for same feature as part of
docker/docker#14113 docs review.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
2015-08-13 16:37:20 +10:00
Tim Dettrick
03f65b3d0d Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee3.

Original commit (for which this is effectively a rebased version) is
72a500e9e5 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
2015-08-13 16:36:44 +10:00
Kai Blin
8a61e2b151 reference/run: Add some articles
Signed-off-by: Kai Blin <kai@samba.org>
2015-08-13 06:35:48 +02:00
Kai Blin
4d89910820 reference/run: Add a paragraph break
Signed-off-by: Kai Blin <kai@samba.org>
2015-08-13 06:34:57 +02:00
moxiegirl
650feb29f1 Merge pull request #15541 from thaJeztah/hashtag-space
docs: fix fedora prerequisites heading
2015-08-12 19:33:38 -07:00
Jessie Frazelle
30cf473f26 Merge pull request #15543 from icecrime/15536_partial_manifest
Fix partial manifest push
2015-08-12 19:19:07 -07:00
Arnaud Porterie
72e55cb0ec Merge pull request #15399 from Microsoft/10662-portmapping
Windows: [TP3] Enable NAT port mapping
2015-08-12 19:07:14 -07:00
Arnaud Porterie
697cdb8e2f Update regression test
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-08-12 18:46:55 -07:00
Arnaud Porterie
4f3b0d0f4a Revert #14884
This reverts commit 810d3b2642.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-08-12 18:46:48 -07:00
Morgan Bauer
c50e78e799 fix link
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-12 17:20:20 -07:00
Sebastiaan van Stijn
e26ee9a317 Merge pull request #15521 from albers/changelog-rollover
[Fix 15520] wrong feature description (rollover) in changelog
2015-08-13 02:17:42 +02:00
David Calavera
d50881e446 Merge pull request #15449 from albers/completion-help
Remove -h flag from completion and daemon reference
2015-08-12 17:09:51 -07:00
Sebastiaan van Stijn
2c18e1cd05 docs: fix fedora prerequisites heading
Fixes the prerequisites heading not being
rendered properly, because of a missing space.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-08-13 01:29:10 +02:00
John Howard
4393be7100 Windows: Enable NAT port mapping
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-12 13:17:27 -07:00
Alexander Morozov
d50d56b352 Merge pull request #15531 from Microsoft/10662-buildercommands
Windows: Error on unsupported builder command
2015-08-12 13:13:03 -07:00
Alexander Morozov
d8ff9ef2b5 Merge pull request #15504 from kolyshkin/zfs-nitpicks
zfs nitpicks
2015-08-12 11:54:35 -07:00
Jessie Frazelle
d3198fa8c4 Merge pull request #15446 from cpuguy83/better_err_on_exec_err
Return better errors from exec
2015-08-12 11:13:29 -07:00
John Howard
394ccfac07 Windows: Error on unsupported builder command
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-12 10:02:23 -07:00
moxiegirl
8a0efadee1 Merge pull request #15450 from liubin/liubin/change-port-number-through-example
change port number through example context
2015-08-12 09:49:50 -07:00
Jessie Frazelle
e82358586d Merge pull request #15183 from jfrazelle/test-install-script
add file to test install script
2015-08-12 09:49:35 -07:00