Commit Graph
17692 Commits
Author SHA1 Message Date
Brian Goff f403372672 Fix inspect output when no log driver specified
Config options were being ignored in the inspect output when no driver
was specified.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2f2779b6a5c8f6efcd2ba55bf7cb0db54c259726
Component: engine
2015-08-17 11:35:34 -04:00
Sebastiaan van Stijn 63ab074ee2 Merge pull request #15237 from charleswhchan/patch-3
Reformat /containers/(id)/resize to make it consistent with other sections.
Upstream-commit: bba762b19254b8315aa8d5a6a63cb00253eaa42c
Component: engine
2015-08-16 10:59:16 +02:00
Charles Chan 5ba2c88bd5 Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 6cd2d8946902eddab5e3902efeef3c7ffd748a1e
Component: engine
2015-08-15 19:47:01 -07:00
Sebastiaan van Stijn f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
Brian Goff 47be27e424 Merge pull request #15602 from Microsoft/10662-blockfromscratch
Windows: Block 'FROM scratch'
Upstream-commit: a6e0a6852dbfaa29ec76e9fcfd1bd7f9c499afbe
Component: engine
2015-08-14 21:12:15 -07:00
Arnaud Porterie 8118199b84 Merge pull request #15601 from mrjana/vendor18
Vendoring in vishvananda/netlink
Upstream-commit: 167783eb137bbf453e3228e12b2cb82fec8ab387
Component: engine
2015-08-14 20:22:54 -07:00
Arnaud Porterie 28513048f1 Merge pull request #15598 from cpuguy83/15570_fix_exec_tty
Fix issue with exec TTY caused by 15446
Upstream-commit: bd9cc788d0245fe1fcd3370dd8a55eb94f781665
Component: engine
2015-08-14 19:43:04 -07:00
John Howard 49c0f6d3fb Windows: Block 'FROM scratch'
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6df6e2e405a08bac2a81639349bc9a20c6014619
Component: engine
2015-08-14 18:17:19 -07:00
Jana Radhakrishnan 7c6dc2bb99 Vendoring in vishvananda/netlink
Updating netlink package to 4b5dce31de6d42af5bb9811c6d265472199e0fec
to fix certain wierd netlink issues seen.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 7948b755c77a3901ffb5b397659c72ae4e6f4340
Component: engine
2015-08-14 18:02:58 -07:00
Sebastiaan van Stijn fa48a1ffaf Merge pull request #15595 from estesp/build-experimental
Add info on how to build experimental binaries
Upstream-commit: 837a66e79b0d458ba12a2ff7bd0ade2770ba9e71
Component: engine
2015-08-15 01:32:10 +02:00
Brian Goff 57a36297f7 Fix issue with exec TTY caused by 15446
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5ffcecf130aea8c0b92d1be728e2c302cf2c6c70
Component: engine
2015-08-14 14:55:26 -07:00
moxiegirl 6d118e9c38 Merge pull request #15428 from charleswhchan/patch-1
Improve/fix "Dockerizing Applications" page.
Upstream-commit: aedd45346a19f9d06ebeec9ca7117a104e0c23c1
Component: engine
2015-08-14 14:03:11 -07:00
David Calavera ac8160b56d Merge pull request #15525 from albers/completion-option-updates
Updates to bash completion for docker run and docker daemon.
Upstream-commit: 313b37129a585f064d32ebf0c4e1a938a0d1fa2c
Component: engine
2015-08-14 13:55:11 -07:00
Phil Estes d18dfea156 Add info on how to build experimental binaries
..also update the text that says "TO.BE.DETERMINED" to the actual URL
where the experimental nightlies are published.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 3f8d60ac2f7c62aa9b9128af0ebbb9aa1bad6ad1
Component: engine
2015-08-14 16:45:38 -04:00
Jessie Frazelle 3ee405c46c Merge pull request #15568 from Microsoft/10662-commitrunning
Windows: Stop commit on running container
Upstream-commit: 424fa598597bd6d716d50dde076b0f4830b60ff8
Component: engine
2015-08-14 13:13:42 -07:00
Tibor Vass 809e0fd73f Merge pull request #14530 from Microsoft/10662-serversidevalidation
Windows: [TP3] Move netmode validation to server
Upstream-commit: 3e523ae015750be4893b9c5a4f77361fbb0e9849
Component: engine
2015-08-14 16:05:59 -04:00
John Howard da7258ee55 Move netmode validation to server
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f6ed590596cbf73764b40ff4f32f90b1cdb8b213
Component: engine
2015-08-14 12:17:41 -07:00
Tianon Gravi d4057c5dec Merge pull request #15580 from hqhq/hq_fix_NETPRIO_check
Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
Upstream-commit: 53b1f993ab46cd229e2d765525f8cd09a8692800
Component: engine
2015-08-14 12:03:03 -07:00
Alexander Morozov e91a683ee8 Merge pull request #15584 from mavenugo/ln-vendor-in
Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
Upstream-commit: d1fada4bf7331bda6e45d827a07a2f0438ac8acf
Component: engine
2015-08-14 11:56:47 -07:00
Sebastiaan van Stijn 5c54eac36d Merge pull request #15519 from albers/changelog-dangling
[Fix 15518] wrong feature description in changelog
Upstream-commit: f39323c1e3e1de1bfc19ea436cfc8272c54193e0
Component: engine
2015-08-14 20:48:48 +02:00
Sebastiaan van Stijn dee8618b49 Merge pull request #15524 from veggiemonk/patch-README
update README.md
Upstream-commit: 575a104b3f98799ddd3a3fbd1172748ae3d23a64
Component: engine
2015-08-14 20:45:40 +02:00
Sebastiaan van Stijn b867f2e185 Merge pull request #15542 from MHBauer/rundoclink
fix link
Upstream-commit: d1585f1d6610c36d3d0ba93421ed605d9fd9931d
Component: engine
2015-08-14 20:35:51 +02:00
moxiegirl 6c82403d31 Merge pull request #15574 from diogomonica/fixing-race-on-key-backup
Fixing race condition on private key backup how-to
Upstream-commit: 424702b91ac31a5caaad0a2c97693db87170d40f
Component: engine
2015-08-14 11:26:56 -07:00
moxiegirl f739b706e0 Merge pull request #15576 from estesp/hows-about-a-minor-typo
Correct readability of --userland-proxy para.
Upstream-commit: ff155ce6eeb696b057bc62f5b8e7e2315b95bff3
Component: engine
2015-08-14 11:26:21 -07:00
Arnaud Porterie 0f5d7b6011 Merge pull request #15491 from Microsoft/10662-fixtar
Windows: [TP3] Fixing Tar functions to support long paths.
Upstream-commit: 28a17c8a035b05d26f01dcd51b1e20b870ec7fa5
Component: engine
2015-08-14 09:41:42 -07:00
Madhu Venugopal 89380524e8 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>
Upstream-commit: 703e2264bae99784496794365ea72348715e7c70
Component: engine
2015-08-14 05:57:47 -07:00
Qiang Huang 1e7e48f2b6 Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
Fixes: #15572

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 6c4d4c70c6618fc84fc815d14c92ea60f0be538e
Component: engine
2015-08-14 14:38:48 +08:00
Arnaud Porterie b4d25ce7ed Merge pull request #14758 from Microsoft/10662-pipestohcs
Windows: [TP3] new hcsshim stdin/out/err handling
Upstream-commit: 693ff58cd2db719884577c7573e7f74ade8a3e50
Component: engine
2015-08-13 22:52:48 -07:00
John Howard 880ecdb34d Windows: Stop commit on running container
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4b933dd2eaae17e4931b7414e3cead370124ec5a
Component: engine
2015-08-13 22:17:03 -07:00
Phil Estes 2ad32c4a2a 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>
Upstream-commit: 4e53e80934f1813ff3e66d69fc931ed59707ffc6
Component: engine
2015-08-13 23:56:42 -04:00
Diogo Monica f65a61ad5d Fixing race condition on private key backup how-to
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: fbb268c12ab12fa282f11eabdedf7fdee3d24b4a
Component: engine
2015-08-13 19:16:00 -07:00
David Calavera 42a96fd466 Merge pull request #15065 from calavera/new_release_branch_workflow
Make the release process more atomic between major releases.
Upstream-commit: 54b50479af00f88746cd719fe01fb6d60c632f25
Component: engine
2015-08-13 16:10:11 -07:00
Jessie Frazelle da97ba6880 Merge pull request #15545 from LK4D4/refactor_pullv2
Refactoring of pullV2Tag
Upstream-commit: b93d99b25d2d0797d985c4529292435c74da75c3
Component: engine
2015-08-13 15:52:14 -07:00
Jessie Frazelle 53cf427573 Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc
Tiny fix for rpm and deb descriptions
Upstream-commit: 46d9fd6a11968e53bf18677ab9a44f3aec4edf21
Component: engine
2015-08-13 15:04:50 -07:00
John Starks 84c4707817 Windows: new hcsshim stdin/out/err handling
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ec5a73d18eb6a5241cdaa0b5d473abb085d6f491
Component: engine
2015-08-13 13:09:42 -07:00
Sebastiaan van Stijn f1cc5568e9 Merge pull request #13501 from vdemeester/8048-image-repository-tag
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
2015-08-13 21:36:21 +02:00
Alexander Morozov 8771bcf9d5 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>
Upstream-commit: 9b2426c606b92fa37b7484d9d884edd43352b69c
Component: engine
2015-08-13 11:50:19 -07:00
Sebastiaan van Stijn 6c6e94b0e5 Merge pull request #15560 from docker/patch-bad-formatting
Fixing bad formatting reported by David via email
Upstream-commit: 599b76000d64cd4771410513812fe3560467f82b
Component: engine
2015-08-13 20:26:05 +02:00
Jessie Frazelle 683400e786 Merge pull request #15559 from liusdu/liusdu-type
fix a typo in graph/graph.go
Upstream-commit: 355f640d4d6c7f4cd4e3dafedd7f8eb5a8f2d0c5
Component: engine
2015-08-13 09:33:00 -07:00
Jessie Frazelle 8d8081f715 Merge pull request #15563 from ankushagarwal/changelog
Add 1.8.1 CHANGELOG
Upstream-commit: 53812e51f42249c8339ffa181438a66d0bde2864
Component: engine
2015-08-13 09:28:31 -07:00
Ankush Agarwal 42e8a805e7 Add 1.8.1 CHANGELOG
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 4ac8fd98b302a2404a9438762d97f65e15f7a015
Component: engine
2015-08-13 09:02:04 -07:00
Sebastiaan van Stijn 2a1429c0c6 Merge pull request #15451 from liubin/liubin/fix-broken-link
fix broken link to wiki
Upstream-commit: 6b1b1ad31cc0b0433ec33743488b40d8f1919894
Component: engine
2015-08-13 17:03:41 +02:00
moxiegirl d1f9849564 Merge pull request #15554 from HuKeping/docs-notary
Docs: some fix about notarysandbox
Upstream-commit: 68a4beeba47c1bf0084449896e0f9d331fcdd041
Component: engine
2015-08-13 07:47:35 -07:00
bin liu a65c38b101 fix broken link to glossary page.
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: f6753cd9635b294f1463ef7fb6952dd2a74c0a69
Component: engine
2015-08-13 22:40:20 +08:00
moxiegirl 13929d0935 Fixing bad formatting reported by David via email
Fixed and tested

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ef453f7118d704319768d8d9c0cfe79e2d521afa
Component: engine
2015-08-13 06:42:26 -07:00
Liu Hua b52277b7fd fix a typo in graph/graph.go
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: 883fcfe4256d5d5bf1b3bfbced61fa585fe07a73
Component: engine
2015-08-13 20:01:43 +08:00
Hu Keping 155dc9b901 Docs: some fix about notarysandbox
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 79aac6584de8c5cd1797933f20b6d9b1c2fa33e9
Component: engine
2015-08-13 16:53:05 +08:00
Vincent Demeester d024131050 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>
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
2015-08-13 08:50:09 +02:00
Tim Dettrick 273be038ad 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>
Upstream-commit: 90326939c8089dbd7b59423415bc67cae6208b08
Component: engine
2015-08-13 16:37:20 +10:00
Tim Dettrick 337be087f4 Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.

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

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600
Component: engine
2015-08-13 16:36:44 +10:00