toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,201 Commits 3 Branches 295 Tags
fb7a3051cbca2d3f772479caa2b6087e424f0b5d
Commit Graph
24201 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnaud Porterie 13d28f3181 Merge pull request #22353 from Microsoft/jjh/dockercp 
Windows: docker cp platform semantically consistent paths
Upstream-commit: b3a1ae02a91d93efdface95ce7ed131dc397dedd
Component: engine
 2016-05-11 13:08:24 -10:00
Arnaud Porterie b47a34c25a Merge pull request #22368 from tianon/wheezy-lts 
Update contrib/mkimage/debootstrap to include wheezy-lts
Upstream-commit: 78e9f2e9e74a0c25318054ed21c539acfb44e235
Component: engine
 2016-05-11 12:49:26 -10:00
Arnaud Porterie fee867dae4 Merge pull request #22365 from dnephin/fix_selinux_for_dockerd 
Update the binary name in docker-engine-selinux/docker.fc
Upstream-commit: bacce5ef4f77acc9450e46bc7a4ca8ad3330b134
Component: engine
 2016-05-11 12:44:55 -10:00
Arnaud Porterie e4da61ff20 Merge pull request #22356 from allencloud/close-http-response-body-when-attaching 
close http response body when attaching
Upstream-commit: 28452ca78346cf8824ea71be35b4773f96405b1a
Component: engine
 2016-05-11 12:44:35 -10:00
Arnaud Porterie 3f6678c440 Merge pull request #22262 from kencochrane/fix_release_deb 
Create the correct directory structure for apt-ftparchive
Upstream-commit: dc430944b9682b0f46806dcb7bd733d25e2b6f31
Component: engine
 2016-05-11 12:38:12 -10:00
Tomasz Kopczynski af05fef951 Reimplementing builder integration tests as unit tests 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 18eeb399852b7efe9459a1d77b0a5032a6b88bba
Component: engine
 2016-05-11 22:13:39 +02:00
kevinmeredith 7bad1decfe Correct docs for a docker container's clean-up. 
The 'Unix Signals' (https://en.wikipedia.org/wiki/Unix_signal#Handling_signals) wiki explains that:
> 'There are two signals which cannot be intercepted and handled: SIGKILL and SIGSTOP.'

Signed-off-by: kevinmeredith <kevin.m.meredith@gmail.com>
Upstream-commit: ef7cd217663c7f6bff5f1d49461c004e86fed867
Component: engine
 2016-05-11 14:58:23 -04:00
Antonio Murdaca db5abbb3ee Merge pull request #22637 from LK4D4/simplify_tcp_proxy 
pkg/proxy: remove unused 'transfered' variable
Upstream-commit: 730b974c641242cedd96d5982495261aa7ba5c81
Component: engine
 2016-05-11 20:56:31 +02:00
Tibor Vass 624bb38952 Merge pull request #21708 from tianon/InRelease 
Also generate "InRelease" files for newer APT clients
Upstream-commit: e421668b1bdd611e49cd268341e75d9f5e8801c2
Component: engine
 2016-05-11 13:21:15 -04:00
Vincent Demeester db8ad55d48 Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist 
docs: update seccomp whitelist
Upstream-commit: 4c654eeea209b9770071fe190d27976622298cdd
Component: engine
 2016-05-11 18:59:53 +02:00
Sebastiaan van Stijn d537ac63ac docs: update seccomp whitelist 
the 'modify_ldt' was listed as "blocked by default",
but was whitelisted in 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b

this updates the documentation to reflect this

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2cddd1cd1f3135f36f6afcc84ddfda904aeee3b5
Component: engine
 2016-05-11 18:45:27 +02:00
Sebastiaan van Stijn eb47def058 Merge pull request #22666 from yongtang/05112016-update-deprecated-docs-cli-flags 
Update deprecated docs for cli flags removal.
Upstream-commit: 3710f9074e7cb752def69b1b80e4af3e6ed87daf
Component: engine
 2016-05-11 18:05:52 +02:00
Alexander Morozov 906e7550b5 Merge pull request #22278 from runcom/fixies-dockerd 
Fixies dockerd
Upstream-commit: fd3a795a478cec71d2c9fd2178c67482f04ef029
Component: engine
 2016-05-11 07:57:00 -07:00
Alexander Morozov 958502d650 Merge pull request #22642 from amitkris/uprev_gozfs 
update go-zfs to include Solaris support
Upstream-commit: da74f9653dc11c28e0b70267a2882628945051e9
Component: engine
 2016-05-11 07:41:17 -07:00
Yong Tang 50921875d5 Update deprecated docs for cli flags removal. 
The old command line options have been deprecated in 1.8.0 and
eventually removed in 1.10.0 through PR #17724, though the
deprecated.md still shows `Target For Removal In Release`.

This fix updates the deprecated.md and changes
`Target For Removal In Release` to `Removed In Release`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0a4de93e1371a0d62ca6f3a5121368d7ecfde3fe
Component: engine
 2016-05-11 06:48:07 -07:00
Antonio Murdaca 97e6cef981 contrib: init: use dockerd 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1
Component: engine
 2016-05-11 11:00:11 +02:00
Alexander Morozov d3b9fbad27 Merge pull request #22511 from crosbymichael/update-runc-containerd 
Update runc and containerd deps
Upstream-commit: af60a9e599543daa70da6d5d3b07343aa780c3ad
Component: engine
 2016-05-10 15:06:23 -07:00
Alexander Morozov a24c6ed1b5 pkg/proxy: remove unused 'transfered' variable 
That simplified code a bit

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 34175eb47ef5de023b68cef5af529b74c68b3ab3
Component: engine
 2016-05-10 14:33:21 -07:00
Amit Krishnan 3314e541a1 update go-zfs to include Solaris support 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: efb3946171ffa30b716a0614e8037c6b0e699771
Component: engine
 2016-05-10 13:51:03 -07:00
Sebastiaan van Stijn 1a0db3e886 Merge pull request #22634 from thaJeztah/dj-jazzy-jess 
Add Jess to alumni
Upstream-commit: a4bb2c7d7a1da18c26626467f124d5532a9f927e
Component: engine
 2016-05-10 22:08:56 +02:00
Sean Christopherson 3ff3d68824 Add the swapMemorySupport requirement to OOM tests 
Add the swapMemorySupport requirement to all tests related to the OOM killer.  The --memory option has the subtle side effect of defaulting --memory-swap to double the value of --memory.  The OOM killer doesn't kick in until the container exhausts memory+swap, and so without the memory swap cgroup the tests will timeout due to swap being effectively unlimited.

Document the default behavior of --memory-swap in the docker run man page.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Upstream-commit: adabb51311ecac031bd72378c5ed1669d1835d40
Component: engine
 2016-05-10 11:28:00 -07:00
John Howard 3f5fe19aa9 Windows: Terminate on failed shutdown 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: feacb1205b2cf9166e75e707d7b5fa2d09e80e03
Component: engine
 2016-05-10 10:09:50 -07:00
John Howard 7f34b3bcd4 Merge pull request #22619 from jterry75/master 
Adds a correct error string for network validation
Upstream-commit: 59db39c5c86d89e16654fdd0dc6cf6492b42fbea
Component: engine
 2016-05-10 10:02:54 -07:00
Sebastiaan van Stijn 1a17a9a9ba refactor overlay storage driver compatibility check 
use a consistent approach for checking if the
backing filesystem is compatible with the
storage driver.

also add an error-message for the AUFS driver if
an incompatible combination is found.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1fc0acc9ae77752858057d1f6f8487ccd82372be
Component: engine
 2016-05-10 18:22:36 +02:00
Sebastiaan van Stijn 2b1d6ba44a Add Jess to alumni 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d14a1c30f259ba5dfce5183105a2ccab81dcc64c
Component: engine
 2016-05-10 17:58:18 +02:00
Yong Tang 979a878be3 Remove deprecated driver specific log tags 
Since 1.9, driver specific log tag options
`syslog-tag`
`gelf-tag`
`fluentd-tag`
have been deprecated in favor of the generic tag
option which is standard across different logging
drivers.

This fix removed the deprecated driver specific
log tag options of `syslog-tag`, `gelf-tag`,
`fluentd-tag` for 1.12 and updated the docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a20b02b9158c283402d174926c84e657e53b17a1
Component: engine
 2016-05-10 07:43:44 -07:00
Sebastiaan van Stijn ff7a73e938 Merge pull request #22603 from runcom/fix-docker-build 
pkg: chrootarchive: chroot_linux: fix docker build
Upstream-commit: 2f7c84120dbe918fc6c7201764765d5beb448021
Component: engine
 2016-05-10 10:23:18 +02:00
Justin Terry bf84b3cfbf Adds a correct error string for network validation 
Fixes the negative networking test to include the new error string
from recent Windows builds.

Signed-off-by: Justin Terry <juterry@microsoft.com>
Upstream-commit: 47ef6d7969a3396f6ecc3bb27aac425b1a65b344
Component: engine
 2016-05-09 16:37:14 -07:00
Antonio Murdaca 0bc559ba8a pkg: chrootarchive: chroot_linux: fix docker build 
The path we're trying to remove doesn't exist after a successful
chroot+chdir because a / is only appended after pivot_root is
successful and so we can't cleanup anymore with the old path.
Also fix leaking .pivot_root dirs under /var/lib/docker/tmp/docker-builder*
on error.

Fix https://github.com/docker/docker/issues/22587
Introduced by https://github.com/docker/docker/pull/22506

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5248f5c3d1d91ea4235ffe57962e38293af18f34
Component: engine
 2016-05-10 00:42:49 +02:00
Michael Crosby 820ddc1c92 Update protobufs to 8d92cf5fc15a4382f8964b08e1f42a 
This syncs the protobuf version with the one that is used with
containerd.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4e290986cdf08a34ad508473bab702793503fa6b
Component: engine
 2016-05-09 15:21:41 -07:00
Michael Crosby dbf25e32d6 Fix containerd proto for connection 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6889c3276c6895a8440dc8883b8cd608793199f3
Component: engine
 2016-05-09 15:17:10 -07:00
Michael Crosby 783763f84c Update runc and containerd deps 
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cfb976438677b15ec023b2ad4822bf1b2f63cc8f
Component: engine
 2016-05-09 15:05:44 -07:00
Alexander Morozov e078dcd609 Merge pull request #22465 from allencloud/handle-error-when-getting-hostname-in-docker-info 
handle error when getting hostname in info api
Upstream-commit: e16753ce192cc80d3e207d7b3063a9dab36983cb
Component: engine
 2016-05-09 14:57:36 -07:00
Sebastiaan van Stijn b258c5f0d3 Merge pull request #22611 from tonistiigi/attach-docs 
docs: clarify docker attach
Upstream-commit: e8aac7de4c2491cf7d9ba5233269602e6f5c54d3
Component: engine
 2016-05-09 22:59:07 +02:00
Tonis Tiigi e256c77fe9 docs: clarify docker attach 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: da1dbd2093ec040f05f4daf9fc8ca28dc8262ec8
Component: engine
 2016-05-09 13:35:34 -07:00
Sebastiaan van Stijn 271dfa3943 Merge pull request #22609 from cyli/minor-docs-update 
Minor tense correction for deprecated docs
Upstream-commit: 251b273fd23711ef187b05c13dbabb480bac86b0
Component: engine
 2016-05-09 19:48:12 +02:00
cyli cb9d2ba5ea Minor tense correction for deprecated docs 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: d73589331df4288aa6211fb3733598bbad67b73b
Component: engine
 2016-05-09 10:29:42 -07:00
Brian Goff 496d63e99d Merge pull request #22562 from tonistiigi/fix-loopback-release 
Clean loopbacks in TestDaemonNoSpaceLeftOnDeviceError
Upstream-commit: c5e3644f03acb71473a1c19437891f6903aca738
Component: engine
 2016-05-09 13:28:08 -04:00
Alexander Morozov 91eda97012 Merge pull request #22574 from yongtang/05072016-remove-deprecated-trust-env 
Remove deprecated Docker Content Trust ENV passphrase variables
Upstream-commit: fad0305ee3f697c70654e4ade7dfdd92483eb3e1
Component: engine
 2016-05-09 10:10:27 -07:00
Jess Frazelle a21f04a60f docs: add security non-events 
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Signed-off-by: Jess Frazelle <me@jessfraz.com>
Upstream-commit: 6f06e98f57fe4564003d5b2adbe4ef2fcfbe8df8
Component: engine
 2016-05-09 09:35:19 -07:00
Tibor Vass 2268ea362d Merge pull request #22606 from mlaventure/allow-changing-wheezy-backport-mirror 
Allow changing wheezy deb builder backport mirror
Upstream-commit: 9ffd2652e249f02515410487bdc41e348e7979b1
Component: engine
 2016-05-09 12:23:58 -04:00
Kenfe-Mickael Laventure 8d0748f1ff Allow changing wheezy deb builder backport mirror 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6a033e617f6c948788c580b26c6567d7d9ef359e
Component: engine
 2016-05-09 09:10:30 -07:00
Vincent Demeester 3843118a42 Merge pull request #21115 from wenchma/linkable 
update link comments
Upstream-commit: 20d5d10983b3e126427aa920d9f5ac8c68967c27
Component: engine
 2016-05-09 14:37:34 +02:00
Sebastiaan van Stijn 34aa0cad09 Merge pull request #22572 from yongtang/05072016-add-missing-subtitle-in-deprecated-docs 
Add the missing subtitle in deprecated docs for --security-opt
Upstream-commit: 3deb2d7280404f9fadd7af2a10bc9a0aad2fc419
Component: engine
 2016-05-09 12:18:11 +02:00
Wen Cheng Ma 9bf044b2a7 update link comments 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: c52a373bc8c914f41b0451964e15c007f2754436
Component: engine
 2016-05-09 14:12:28 +08:00
Vincent Demeester 05f2e3a4d2 Merge pull request #22589 from duglin/fixErr 
Err was never being returned
Upstream-commit: 1e4068713bdc7ac57c5134ae0469dc7ecefb8445
Component: engine
 2016-05-08 17:31:43 +02:00
Doug Davis 9da7afb9c6 Err was never being returned 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0687d76ab1f54250ee7611822d4194a44217fa83
Component: engine
 2016-05-08 05:51:59 -07:00
Antonio Murdaca 2e52fc323e pkg: authorization: cleanup tests 
- do use use log pkg
- do not t.Fatal in goroutine
- cleanups

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 6a96684442a7e9d6e2d00e9b11d23ea6caa88a2a
Component: engine
 2016-05-08 14:18:38 +02:00
Vincent Demeester 2e2bf73e66 Merge pull request #22400 from runcom/fix-git-branch-name 
Makefile: clean git branch before building
Upstream-commit: ac2f4dd71b9d1e7d028bf3e7cb3b662c109c5836
Component: engine
 2016-05-08 13:50:43 +02:00
Antonio Murdaca b24dc50f14 Makefile: clean git branch before building 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a4192471cd6d6012a66c19a635a11c7f6139d683
Component: engine
 2016-05-08 11:52:38 +02:00