Commit Graph
37584 Commits
Author SHA1 Message Date
Brian Goff 43cd078fda Merge pull request #33727 from rremer/test-cleanup-daemon-logger
cleanup daemon/logger/adapter_test.go
Upstream-commit: f0024808a1844cc5004461f40c5d840a48e14d48
Component: engine
2017-06-19 05:56:43 -07:00
Royce Remer 0e43fa4b98 * standardize timeouts for log reads and writes for logger adapter tests
* use an assertion framework in logger adapter tests

Signed-off-by: Royce Remer <royceremer@gmail.com>
Upstream-commit: b3add005d5135f64670f6502357cde5bd8d03f75
Component: engine
2017-06-18 18:47:45 -07:00
Brian Goff 0db82d1f6c Don't chown/chmod volumes if not needed.
Doing a chown/chmod automatically can cause `EPERM` in some cases (e.g.
with an NFS mount). Currently Docker will always call chown+chmod on a
volume path unless `:nocopy` is passed in, but we don't need to make
these calls if the perms and ownership already match and potentially
avoid an uneccessary `EPERM`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f05a023760493dbd41fbfc1bb76ad334b579e94e
Component: engine
2017-06-18 16:44:52 -07:00
Brian Goff f162d46aa3 Add conflicts with docker-ee
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1c0fdb57a4c7d485f301050e140ad57bdf231cde
Component: packaging
2017-06-18 15:24:56 -07:00
Tõnis Tiigi 8f272dd02c Merge pull request #33403 from szegedim/33126-whitelist-adjtimex
Whitelisting adjtimex get time operation and requiring CAP_SYS_TIME only in case of adjustment
Upstream-commit: 4f259698b07653e9e5220e097df79862f9e54b74
Component: engine
2017-06-16 21:30:35 -07:00
Andrew Hsu bfbdad0a36 Merge pull request #17 from cpuguy83/obsolete_docker-selinux_pkg
Mark docker-*-selinux pkgs as obsolete
Upstream-commit: 43edc2d7fee731d0cac7b221266b9bd8e5cd5377
Component: packaging
2017-06-16 15:44:12 -07:00
Aaron Lehmann 6f4d8ba43b Merge pull request #124 from darrenstahlmsft/revendorGowinio
Update go-winio to v0.4.1
Upstream-commit: 5dd30732a2
Component: cli
2017-06-16 15:21:55 -07:00
Brian Goff a438006e4f Mark docker-*-selinux pkgs as obsolete
These are replaced by `container-selinux` on fedora-25 and centos-7.
Marking these packages as obsolete makes the installation process a bit
smoother, otherwise the user will have to manually uninstall the older
packages to install the new one.

Also makes fedora24 use container-selinux which is now supports labeling
the `dockerd` binary correctly.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 94943b47520aa81bbe30fbc4eb927c79047ef6d2
Component: packaging
2017-06-16 17:27:51 -04:00
Brian Goff a93d31683c Merge pull request #199 from adshmh/remove-logging-from-command-formatter-package-tests
removed logging from command/formatter package tests
Upstream-commit: f767b9a118
Component: cli
2017-06-16 14:08:39 -04:00
Sebastiaan van Stijn 3703860d4e Merge pull request #33517 from naveed-jamil-tenpearls/pkg/reexec
Added Test Case Coverage for PKG/REEXEC
Upstream-commit: acf23c736724c861236d8b5cbee339c812fe9d7f
Component: engine
2017-06-16 15:24:51 +02:00
Brian Goff 01abe5df95 Merge pull request #33712 from cyli/redact-ca-signing-cert
Redact swarm spec CA signing cert for usability reasons
Upstream-commit: 0919a1da149705f1ba50610346cea6f14574dd10
Component: engine
2017-06-16 09:21:59 -04:00
Sebastiaan van Stijn 4b515641e8 Merge pull request #32547 from allencloud/make-ulimitOpt-implement-NamedOption
add NamedUlimitOpt to implement NamedOption to fix 32528
Upstream-commit: a6911bf8cc58195bced536b9e3f2b94edf2b5c15
Component: engine
2017-06-16 11:27:01 +02:00
Sebastiaan van Stijn 5a0cf39b76 Merge pull request #33705 from tonistiigi/fix-cobra-vendor
vendor: remove unused package
Upstream-commit: cc73511764227fc3d229cd05adbf01abee593dcf
Component: engine
2017-06-16 10:35:50 +02:00
zebrilee 9fa6954b47 comment the return of setHelpFunc in order to show --help even if the daemon is not running. Then add a if statement in isSupported function to check if the daemon is running
Signed-off-by: zebrilee <zebrilee@gmail.com>

revert change on docker.go, set HasExperimental to true in cli.go

Signed-off-by: zebrilee <zebrilee@gmail.com>
Upstream-commit: cca30cb1d9
Component: cli
2017-06-16 10:24:26 +02:00
allencloud ead60478b8 add NamedUlimitOpt implement NamedOption to fix 32528
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 148f2711e8e78c9cf43b4c30b03b33b16d9e7098
Component: engine
2017-06-16 10:14:09 +08:00
Ying Li d01b45b0ff Redact the swarm's spec's signing CA cert when getting swarm info, because
otherwise if the user gets the info from the API, makes a non-CA related change,
then updates, swarm will interpret this as the user trying to remove the signing
key from the swarm.  We are redacting due to usability reasons, not because
the signing cert is secret.  The signing KEY is secret, hence it's redacted.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: bdfbd22afbbf16a07f0316656c6c17453df3e0f7
Component: engine
2017-06-15 18:26:01 -07:00
John Howard a014e4af05 Merge pull request #33498 from darrenstahlmsft/IoTDataPartition
Skip evaluation of symlinks to data root on IoT Core
Upstream-commit: b931c35a46bd7606fca5bea0b80dc82c1ed7e0d5
Component: engine
2017-06-15 15:52:01 -07:00
Tonis Tiigi 7d5222b592 vendor: remove unused package
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 932759c288ef3055919388bc0319cddde0bee34a
Component: engine
2017-06-15 13:23:11 -07:00
Daniel Nephin ad6108e6a5 Try out circleci workflow
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 75aebdd463
Component: cli
2017-06-15 12:38:40 -07:00
Arash Deshmeh 3f1fb4c18f removed logging from command/formatter package tests
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 7f71d0d979
Component: cli
2017-06-15 14:14:59 -04:00
Brian Goff c6249de16a Enable dm deferred_* with version check
This enables deferred device deletion/removal by default if the driver
version in the kernel is new enough to support the feature.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0dc1a80565d522fc2cc7c65c3ad2d8ed83aeaf0f
Component: engine
2017-06-15 13:13:42 -04:00
Vincent Demeester 1aa1877000 Merge pull request #198 from thaJeztah/add-exec-example
Added usage example for -e for exec
Upstream-commit: eb7452cf3a
Component: cli
2017-06-15 18:18:48 +02:00
Tõnis Tiigi a19bc856f6 Merge pull request #33585 from moypray/containerd_core
When daemon is in startup process, could not start container
Upstream-commit: 5eca8382b03278dc42c228b3d14dec0909ce655b
Component: engine
2017-06-15 09:13:41 -07:00
Sebastiaan van Stijn 246d4ea4ff Merge pull request #194 from dnephin/run-docs-gen-in-ci
Run docs and man generation in CI
Upstream-commit: 23a0e3b7b7
Component: cli
2017-06-15 17:46:56 +02:00
Sebastiaan van Stijn cd9e55249f Added usage example for -e for exec
Signed-off-by: Vishnu Narayanan <iamwishnu@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c848d9b22d
Component: cli
2017-06-15 17:24:41 +02:00
Robert Schneider 01e1289926 Add option for architecture to mkimage-alpine.sh
Signed-off-by: Robert Schneider <mail@shakeme.info>
Upstream-commit: 23f0c20b021849283fb422fab735d893c1946f46
Component: engine
2017-06-15 15:52:25 +02:00
Robert Schneider 6cc2ed537e Fix getopts in mkimage-alpine.sh
Signed-off-by: Robert Schneider <mail@shakeme.info>
Upstream-commit: a89d282dbb9eefe043a7a2dcfb146b11ade720d1
Component: engine
2017-06-15 15:51:56 +02:00
Andrew Hsu 806904f4de Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-06-15 09:36:47 +00:00
Andrew Hsu d2f94fb172 Merge pull request #16 from andrewhsu/cl
update rpm changelog
Upstream-commit: c79e2cae2efab60df0fcb2ad272da94f1b629c30
Component: packaging
2017-06-15 02:28:14 -07:00
Andrew Hsu 801070c998 update rpm changelog
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 659d6015b6bf8ec3c24cf5377f3eda88beed0a10
Component: packaging
2017-06-15 09:15:43 +00:00
Andrew Hsu 774e4b45e3 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-06-15 08:06:01 +00:00
Andrew Hsu 4634634053 Merge pull request #13 from seemethere/add_systemd_files
Add systemd scripts
Upstream-commit: 9c1135df05c6ae371da5879d8a1be88749a2bfbd
Component: packaging
2017-06-15 01:02:43 -07:00
Daniel Nephin 6c8b2e5bbf Use a fork of gometalinter
Until https://github.com/alecthomas/gometalinter/pull/289 is merged.
This reduces the runtime of the linter by 50x

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4881ef507f
Component: cli
2017-06-14 17:30:45 -07:00
Daniel Nephin b88ae58881 Add gosimple lint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3724fb7f37
Component: cli
2017-06-14 16:55:08 -07:00
Daniel Nephin 003a07af7c Add unparam linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3e3934c19f
Component: cli
2017-06-14 16:55:08 -07:00
Daniel Nephin c9b100a0be Add unconvert linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3bf0317fea
Component: cli
2017-06-14 16:54:27 -07:00
Daniel Nephin 16de65eef4 Add misspell lint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a712993e93
Component: cli
2017-06-14 16:54:27 -07:00
Daniel Nephin 2cdc30d891 Add unused linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01e1e58ada
Component: cli
2017-06-14 16:54:27 -07:00
Aaron Lehmann f816b75526 Merge pull request #33302 from cpuguy83/fix_logs_racey_test_win
Make TestLogsAPIStdout a bit less racey
Upstream-commit: 6d92b0ee15cff0d5fade6533f696c7bc9f314021
Component: engine
2017-06-14 16:35:22 -07:00
Daniel Nephin 1bcf02da4f Run docs and man generation in CI
Also cleanup the scripts a bit to be more consistent, and fail on errors.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 343d836a95
Component: cli
2017-06-14 14:59:48 -07:00
Sebastiaan van Stijn 440a9de896 Merge pull request #33680 from glensc/patch-1
doc: Update 2017-06-12.md
Upstream-commit: e5679f0bffa860f735b2db4309cc72b8871a96b5
Component: engine
2017-06-14 23:11:23 +02:00
Kenfe-Mickaël Laventure cfd4f5c94e Merge pull request #33361 from aaronlehmann/no-join-address
cluster: Only pass a join address when in the process of joining a cluster
Upstream-commit: c86323c19d77e94c280fec9fc78480939d176d1b
Component: engine
2017-06-14 14:08:37 -07:00
Elan Ruusamäe 4b4286a493 Update 2017-06-12.md
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Upstream-commit: 35e15c5c04174ee4bd71ae9ad226e996afa9b41d
Component: engine
2017-06-14 23:16:22 +03:00
Sebastiaan van Stijn 7b49eaf104 Merge pull request #191 from php-coder/improve_user_directive_doc
docs/reference/builder.md: mention that USER directive also allows to specify a user group
Upstream-commit: 4c224a7786
Component: cli
2017-06-14 22:03:38 +02:00
Daniel Nephin 604510bf2e Merge pull request #182 from vdemeester/180-fix-stack-rm-config-endpoint
Do not call the config endpoint if API is lower than 1.30
Upstream-commit: 759e59e4a4
Component: cli
2017-06-14 14:31:01 -04:00
Aaron Lehmann d2ab6e1508 Merge pull request #193 from dnephin/why-cover-so-slow
Speed up testing with coverage
Upstream-commit: 45c2c4c18f
Component: cli
2017-06-14 11:29:42 -07:00
Daniel Nephin b937aa98bc Merge pull request #192 from adshmh/remove-logging-from-service-inspect-test
remove logging from service/inspect test case to clean up the output of running tests
Upstream-commit: 63eff6548b
Component: cli
2017-06-14 14:23:40 -04:00
Daniel Nephin 6ca362a6db Speed up testing with coverage
By running a 'go test -i' on all the packages first the overall runtime is significantly
decreased.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3a9ba545bc
Component: cli
2017-06-14 10:57:36 -07:00
Vincent Demeester 3c78860ecb Merge pull request #33637 from thaJeztah/improve-ci-build-time
Minor refactor/cleanup of tests
Upstream-commit: 7fdc2e42d1d8eadf38976c3363b994040ad28fa5
Component: engine
2017-06-14 19:45:48 +02:00
Arash Deshmeh 9a1729bb2b removed logging from service/inspect test to clean up the output of running tests
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 751278abe6
Component: cli
2017-06-14 12:38:31 -04:00