toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,387 Commits 3 Branches 295 Tags
ea449e9b10cebb259e1a43325587cd9a0e98d0ff
Commit Graph
40387 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Vincent Demeester 8366463034 Merge pull request #36606 from kolyshkin/t-36561 
integration/TestExportContainerAfterDaemonRestart: add
Upstream-commit: 823de22db611d5079fcc92788a89897daba6f389
Component: engine
 2018-03-16 12:07:46 +01:00
Vincent Demeester 7d839876b1 Merge pull request #945 from vdemeester/trust-follow-up 
Small content trust enhancement
Upstream-commit: a5bd2973b1
Component: cli
 2018-03-16 11:09:00 +01:00
Vincent Demeester da9945b5a8 Merge pull request #36584 from cpuguy83/volume_store_tests 
Add some tests to the volume store
Upstream-commit: bbf568e41c15b609b14a07806cc028972aa7dcd2
Component: engine
 2018-03-16 09:12:55 +01:00
John Stephens 19d8f3bc64 Merge pull request #36610 from Microsoft/jjh/unbreakxenon 
Windows: Hyper-V containers are broken after 36586 was merged
Upstream-commit: d16c77bc01002368a5e9c532e796072ee80214b5
Component: engine
 2018-03-15 21:38:15 -07:00
Eli Uriegas ca5f3626a1 Allow epoch to be changed by a make variable 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: bf9bb7e74e692a829c2058dbcca81349d7d42005
Component: packaging
 2018-03-15 23:34:28 +00:00
Eli Uriegas f925996d4a Move same parts to common variables 
There was a lot of repeated parts in this Makefile, I moved them to a
common variable so that if / when we decide to change how things are run
then it's easy to do so.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c869c9fcf510d1a6c4e25c1a14ea6cb0bb3e6aa4
Component: packaging
 2018-03-15 23:31:46 +00:00
John Howard f89e535fb8 Windows: Fix Hyper-V containers regression from 36586 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0f5fe3f9cf17457761dab28473ece5a7c94f4a0c
Component: engine
 2018-03-15 15:36:36 -07:00
Eli Uriegas 7998309733 Enable new test versioning scheme 
Enables the usage of a new versioning scheme for test builds:
* tp -> Technical Previews
* beta -> Beta Releases
* rc -> Release Candidates
* ga -> General Availability Releases

This PR fixes the versioning order for both `deb` and `rpm` packages
when it relates to the new versioning scheme (which may or may not be
used).

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 9ba8e36e8588ea75209d813558c8065844c953a0
Component: packaging
 2018-03-15 22:16:30 +00:00
GordonTheTurtle 8fabfd2555 Merge component 'engine' from git@github.com:moby/moby master 2018-03-15 17:06:50 +00:00
Sebastiaan van Stijn 3daa4b4cdd Fix stats collector spinning CPU if no stats are collected 
Commit fd0e24b7189374e0fe7c55b6d26ee916d3ee1655 changed
the stats collection loop to use a `sleep()` instead
of `time.Tick()` in the for-loop.

This change caused a regression in situations where
no stats are being collected, or an error is hit
in the loop (in which case the loop would `continue`,
and the `sleep()` is not hit).

This patch puts the sleep at the start of the loop
to guarantee it's always hit.

This will delay the sampling, which is similar to the
behavior before fd0e24b7189374e0fe7c55b6d26ee916d3ee1655.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 481b8e54b45955e40075f49a9af321afce439320
Component: engine
 2018-03-15 17:56:15 +01:00
GordonTheTurtle 145731fe4b Merge component 'cli' from git@github.com:docker/cli master 2018-03-15 16:41:54 +00:00
Brian Goff ce28c959c9 Merge pull request #946 from thaJeztah/bump-moby 
Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702
Upstream-commit: 37eebe5cb6
Component: cli
 2018-03-15 09:49:25 -04:00
Yanqiang Miao 5fc2230d23 add compress option for 'jsonfiles' log driver 
This PR adds support for compressibility of log file.
I added a new option conpression for the jsonfile log driver,
this option allows the user to specify compression algorithm to
compress the log files. By default, the log files will be
not compressed. At present, only support 'gzip'.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

'docker logs' can read from compressed files

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

Add Metadata to the gzip header, optmize 'readlog'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: f69f09f44ce9fedbc9d70f11980c1fc8d7f77cec
Component: engine
 2018-03-15 20:20:05 +08:00