toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,400 Commits 3 Branches 295 Tags
5fd56df388bb045b9556b2e1fa2e4c77263ab478
Commit Graph
40400 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 5fd56df388 Merge component 'engine' from git@github.com:moby/moby master 2018-03-22 17:07:05 +00:00
Vincent Demeester 10376dc96a Merge pull request #36663 from tonistiigi/hijackconn-fix 
client: fix hijackedconn reading from buffer
Upstream-commit: 69091990c72f3a3a6143fe6417a769e7a1a1ff1a
Component: engine
 2018-03-22 17:10:06 +01:00
Vincent Demeester 1f699969f9 Merge pull request #36587 from justincormack/unpriv-caps 
If container will run as non root user, drop permitted, effective caps early
Upstream-commit: b67c1e078c7eeb20199dce301e95fa8999c98109
Component: engine
 2018-03-22 14:51:29 +01:00
Sebastiaan van Stijn 34dd223936 Merge pull request #36647 from adshmh/use-unique-names-for-container-nat-test-containers 
use unique names for test containers of container/nat integration tests 
Upstream-commit: 00c59ed77e186b6f9056bb8e0a2700767b4be383
Component: engine
 2018-03-22 14:03:36 +01:00
Sebastiaan van Stijn 3db81e37ca Merge pull request #36172 from kolyshkin/systemd-memlimit 
Test for systemd cgroupdriver memory setting
Upstream-commit: e2bede01e4a6a6f84e33e2a6debf2cfed5938828
Component: engine
 2018-03-22 13:36:43 +01:00
Akihiro Suda 2748b681fe Merge pull request #36653 from thaJeztah/refactor-windows-service-code 
Split daemon service code to _windows file
Upstream-commit: 3baa5889592894a9d39938aa8fdf08e879cb8a25
Component: engine
 2018-03-22 21:14:17 +09:00
Vincent Demeester 082579ff1b Merge pull request #36551 from selansen/36247 
Fix for Flaky test TestServiceWithPredefinedNetwork
Upstream-commit: cd01c147b1c4b483a75f02de9c9c8416bc8d9ac2
Component: engine
 2018-03-22 10:01:20 +01:00
Tonis Tiigi 4ad54eacb8 client: fix hijackedconn reading from buffer 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f094a05e260d8748f0fd2018a8a908b4189e454d
Component: engine
 2018-03-21 15:29:44 -07:00
GordonTheTurtle ea449e9b10 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-03-21 17:05:32 +00:00
GordonTheTurtle 0545caf82a Merge component 'engine' from git@github.com:moby/moby master 2018-03-21 17:05:26 +00:00
GordonTheTurtle f1b44852ef Merge component 'cli' from git@github.com:docker/cli master 2018-03-21 16:41:19 +00:00
selansen f95a3e7bb8 Fix for Flaky test TestServiceWithPredefinedNetwork 
TestServiceWithPredefinedNetwork test case was failing
	at times. To fix the issue, added new API to check
	for services after we clean up all services. Tested
	multiple times and this sould fix flaky issue.

Signed-off-by: selansen <elango.siva@docker.com>
Upstream-commit: dabffd806c98ab13dbc25e57bee21c5291b9a50c
Component: engine
 2018-03-21 11:49:23 -04:00
Vincent Demeester 48f3c4dac0 Merge pull request #955 from dnephin/remove-filewatcher 
Remove filewatcher
Upstream-commit: c1b58a9096
Component: cli
 2018-03-21 14:31:26 +01:00
Sebastiaan van Stijn bc6cc53700 Split daemon service code to _windows file 
This moves some of the code that was conditionally
executed on Windows to a separate, windows-only file.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cd3e84c6b38e74d03ab31db804bc9b49dcab8243
Component: engine
 2018-03-21 12:57:53 +01:00
Vincent Demeester 5509cd2416 Merge pull request #36594 from vdemeester/e2e-more-run 
integration/*: make e2e run without failure
Upstream-commit: 4460472f4ee419794bb416d131c92dc296b5c625
Component: engine
 2018-03-21 08:54:39 +01:00
Vincent Demeester 81ade09fe5 Merge pull request #36515 from vdemeester/migrate-trusted-suite 
Remove DockerTrustSuite to docker/cli e2e tests
Upstream-commit: 8aa694c91ac727351ebb1deaacad62149e984fd6
Component: engine
 2018-03-21 08:50:59 +01:00
Daniel Nephin 3d78b27c6b Remove filewatcher 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0588a9c8f
Component: cli
 2018-03-20 20:13:27 -04:00
Arash Deshmeh 3d5d533860 container/nat integration tests use unique names for test containers 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: b4d1547af6b91baa2ffcb8a391c35d9bc5cdc48f
Component: engine
 2018-03-20 17:11:03 -04:00
Andrew Hsu 674cdcc02a Merge pull request #95 from seemethere/no_number 
Don't append number when doing a dev build
Upstream-commit: 468d37e0d6d303b785eb9bfc42612397d683c7e5
Component: packaging
 2018-03-19 16:06:31 -07:00
Eli Uriegas b5921cde4f Don't append number when doing a dev build 
Found a bug where a number was being appended to the nightly dev builds
package name causing the latest packages not to be considered as the
latest packages by the package manager.

This makes it so that the nubmer is not included on dev builds.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 63be84fc6ed88847a003dfb32e0dc8bc9126411e
Component: packaging
 2018-03-19 22:17:15 +00:00
Tõnis Tiigi 1c15bdeddb Merge pull request #36466 from thaJeztah/fix-exec-apparmor 
Fix AppArmor not being applied to Exec processes
Upstream-commit: 0c1006f1abc1af7aa6b9847754370d054dfa6c68
Component: engine
 2018-03-19 15:12:41 -07:00
Justin Cormack 3d783d5dbf If container will run as non root user, drop permitted, effective caps early 
As soon as the initial executable in the container is executed as a non root user,
permitted and effective capabilities are dropped. Drop them earlier than this, so
that they are dropped before executing the file. The main effect of this is that
if `CAP_DAC_OVERRIDE` is set (the default) the user will not be able to execute
files they do not have permission to execute, which previously they could.

The old behaviour was somewhat surprising and the new one is definitely correct,
but it is not in any meaningful way exploitable, and I do not think it is
necessary to backport this fix. It is unlikely to have any negative effects as
almost all executables have world execute permission anyway.

Use the bounding set not the effective set as the canonical set of capabilities, as
effective will now vary.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 15ff09395c001bcb0f284461abbc404a1d8bab4d
Component: engine
 2018-03-19 14:45:27 -07:00
Andrew Hsu fbfb3a897f Merge pull request #93 from seemethere/r 
Be less restrictive when moving packages
Upstream-commit: b988c25492369aa89af91fb4c80724153d2a1b0a
Component: packaging
 2018-03-19 14:28:37 -07:00
Eli Uriegas 72a2de1d85 Be less restrictive when moving packages 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 941d99ff6ae57bc06b06b85b7b07210301f454b2
Component: packaging
 2018-03-19 21:26:38 +00:00
Sebastiaan van Stijn 24ded82e63 Merge pull request #36633 from adshmh/add-missing-setup-test-call-to-TestNetworkLoopbackNat 
Add the missing call to setupTest to TestNetworkLoopbackNat test
Upstream-commit: 60e2dc26864370a315dbbb8e3325fe5cc78ba5d5
Component: engine
 2018-03-19 20:45:22 +01:00
Brian Goff c9d18328ef Merge pull request #29932 from miaoyq/container-log-add-archive 
add support for compressibility of log file
Upstream-commit: c4e93da8a6fcd206e3fbfb07b821b5743f90f437
Component: engine
 2018-03-19 15:20:17 -04:00
Kir Kolyshkin 6bad7e6180 Test for systemd cgroupdriver memory setting 
This is a test case for issue https://github.com/moby/moby/issues/35123,
making sure we can set container's memory limit when using
`native.cgroupdriver=systemd`.

[v2: skip if no systemd present]
[v3: add --iptables=false to avoid flaky tests with t.Parallel()]
[v4: rebase after PR#36507 merge]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 4ca5c5361059e29ed31074ca5b96f8b2030b5f99
Component: engine
 2018-03-19 10:33:03 -07:00
GordonTheTurtle 4836f8c6fc Merge component 'engine' from git@github.com:moby/moby master 2018-03-19 17:08:23 +00:00
GordonTheTurtle b6ec97e6cd Merge component 'cli' from git@github.com:docker/cli master 2018-03-19 16:43:04 +00:00
Arash Deshmeh ef1461a872 Add the missing call to setupTest to TestNetworkLoopbackNat test function, to avoid leaving behind test containers 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: a0052b8f190f38bcdd24e4bf794c3ad6d2fd1b41
Component: engine
 2018-03-19 10:56:13 -04:00
Vincent Demeester 27bd98bb9a Merge pull request #36617 from Microsoft/jjh/kernel-registry 
Windows: Move kernel_windows to use golang registry functions
Upstream-commit: 7270b01e5dd1fca3fd7fed0d6fb9d2769ec5f4ba
Component: engine
 2018-03-19 11:47:17 +01:00
Sebastiaan van Stijn da9476e6ad Merge pull request #924 from vdemeester/trust-suite-tests 
Add some content trust tests
Upstream-commit: c0ffb9491c
Component: cli
 2018-03-19 11:24:00 +01:00
Vincent Demeester 0aa2494ead Add more content trust tests 
Importing from moby's DockerTrustSuite tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8b00c5cfd8
Component: cli
 2018-03-19 10:02:40 +01:00
Vincent Demeester d36e75fc44 integration/*: make e2e run without failure 
… mainly by skipping if daemon is remote.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6016e79d2552b21643f4bfd093ce76d8ef956d79
Component: engine
 2018-03-19 09:47:17 +01:00
Vincent Demeester aac739f262 Migrate DockerTrustSuite to docker/cli e2e tests 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5433ceb12ead305d8c85e8e27c4b4d842ef88ae0
Component: engine
 2018-03-19 09:26:35 +01:00
Vincent Demeester 559e0317a4 Merge pull request #36507 from dnephin/use-gty-assert 
Replace testify/assert with gotestyourself/assert
Upstream-commit: 7bda5be956eb1123d597b3c497d938c4d6df3327
Component: engine
 2018-03-19 09:08:06 +01:00
GordonTheTurtle 84547b2a93 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-03-17 17:06:55 +00:00
GordonTheTurtle 574c2dfe88 Merge component 'engine' from git@github.com:moby/moby master 2018-03-17 17:06:48 +00:00
Eli Uriegas e4c18f1d24 Merge pull request #91 from seemethere/new_ver_scheme 
Enable new test versioning scheme
Upstream-commit: 27d07d7e2dbf81001e402657c0e45c375e73a369
Component: packaging
 2018-03-16 11:42:56 -07:00
Eli Uriegas 903f63444d Merge pull request #92 from seemethere/refactor_epoch 
Refactor epoch to be a passable variable for debian packaging
Upstream-commit: c9e56d1cf88bac85b289f364b7fc2e38d9340b96
Component: packaging
 2018-03-16 11:42:46 -07:00
John Howard 5c48fab022 Merge pull request #36609 from thaJeztah/fix-stats-loop 
Fix stats collector spinning CPU if no stats are collected
Upstream-commit: 72ba7f593fa4dbb628cf5ee83cd7daf955934cf5
Component: engine
 2018-03-16 10:35:10 -07:00
GordonTheTurtle d69cb642d7 Merge component 'engine' from git@github.com:moby/moby master 2018-03-16 17:07:01 +00:00
John Howard ad67257ea2 Windows: Move kernel_windows to use golang registry functions 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 29f93c4bc7bb2fbbaaa8c3f809e858ce1f12a0f2
Component: engine
 2018-03-16 09:47:45 -07:00
GordonTheTurtle 18927a1fa0 Merge component 'cli' from git@github.com:docker/cli master 2018-03-16 16:42:15 +00:00
Daniel Nephin 047c647903 Update testing doc 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 58de6277821698a2f97d1a0c83664ab34ff2e8d8
Component: engine
 2018-03-16 11:03:47 -04:00
Daniel Nephin 0fdeea8152 Cleanup pkg/jsonmessage progress tests 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7d8815ea705e85a73248b5d9e468f9dc65277bb8
Component: engine
 2018-03-16 11:03:47 -04:00
Daniel Nephin 0331f04e35 Post migration assertion fixes 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c9e52bd0da0461e605a3678b85702f83081504a7
Component: engine
 2018-03-16 11:03:46 -04:00
Daniel Nephin 60daf5fa97 Automated migration using 
gty-migrate-from-testify --ignore-build-tags

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6be0f709830113966f295401327b027ec2f0bbca
Component: engine
 2018-03-16 11:03:43 -04:00
Daniel Nephin 1c9c9f9e72 Cleanup some assertions 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef01dea8935932486f03a37069720987e805dce6
Component: engine
 2018-03-16 10:54:54 -04:00
Daniel Nephin 59efca5b6e Update vendor 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 073963e3b770efbdf8bd4b4f92d46b2c62eaf434
Component: engine
 2018-03-16 10:54:54 -04:00