Justin Cormack
6ed9fc6e5c
Remove testify dependency as not used any more
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 322adc8a54
Component: cli
2018-04-11 14:14:57 +01:00
Justin Cormack
ac4eb0950b
Update Notary vendor to 0.6.1
...
Minor update.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 8812c54a4d
Component: cli
2018-04-11 14:10:52 +01:00
Yong Tang
48d909a965
Merge pull request #36827 from AntaresS/remove-retry
...
remove the retries for service update
Upstream-commit: 5680ccd4abcc38abe4c4bbaf72656fdf0f236ddd
Component: engine
2018-04-11 06:06:05 -07:00
Vincent Demeester
dc8e81cea5
Merge pull request #35518 from cyphar/libdm-dlsym-deferred_remove
...
pkg: devmapper: dynamically load dm_task_deferred_remove
Upstream-commit: 5219725890816a62185b6c7c0f022351e7aaee84
Component: engine
2018-04-11 14:11:16 +02:00
Vincent Demeester
4059b74760
Make internal/test/daemon.Daemon swarm aware
...
This remove the daemon.Swarm construction by make the new test Daemon
struct aware of swarm.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 83d18cf4e3e84055f7034816eed2a10c04e777ca
Component: engine
2018-04-11 12:10:17 +02:00
Vincent Demeester
bb59f6dc6e
Move ipvlan and macvlan tests on their own folder…
...
… making each folder/suites quicker to run
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a3323d2e4349b7e8d449c6e571ca3d4aa3e53d63
Component: engine
2018-04-11 11:14:58 +02:00
Vincent Demeester
c2ef763ca9
Refactor macvlan tests a bit
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0ab6116ce868a0fc671a49a89696e3a1ce35e26d
Component: engine
2018-04-11 11:14:54 +02:00
Vincent Demeester
2c7fcaadfb
Migrate test-integration-cli experimental ipvlan test to integration
...
All `Ipvlan` related test on `DockerSuite` and `DockerNetworkSuite`
are migrated to `ipvlan_test.go`.
The end goal being to remove the `experimental` builds.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 24f934751120ea420b7ba4d2e314df805f3eff06
Component: engine
2018-04-11 11:14:47 +02:00
Vincent Demeester
1a3ab779c5
Merge pull request #36768 from crosbymichael/booo
...
Don't make container mount unbindable
Upstream-commit: 59d56084347bae27c72752e31f910a266638fe23
Component: engine
2018-04-11 09:54:44 +02:00
Sebastiaan van Stijn
6aec02bb4f
Merge pull request #994 from silvin-lubecki/fix-gometalinter
...
Fixed gometalinter errors on test files
Upstream-commit: 8e1cd515ba
Component: cli
2018-04-10 18:49:42 -07:00
Anda Xu
59714fb174
remove the retries for service update
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: 7380935331f0c35315003578258f6c1f47c1a586
Component: engine
2018-04-10 17:17:02 -07:00
Michael Crosby
c4fdce16ba
Don't make container mount unbindable
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4c000662feb3c8e3d63cbcb044a47f627cd9bb45
Component: engine
2018-04-10 15:14:34 -04:00
GordonTheTurtle
e58320e94a
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-04-10 17:06:52 +00:00
Sebastiaan van Stijn
1f461d4e5c
Merge pull request #36824 from vdemeester/integration-daemon-refactoring
...
Move integration-cli daemon package to internal/test…
Upstream-commit: 68dd184c7c7201030f52c39e55bee170df365d60
Component: engine
2018-04-10 10:06:09 -07:00
GordonTheTurtle
d1f6615693
Merge component 'cli' from git@github.com:docker/cli master
2018-04-10 16:41:33 +00:00
Eli Uriegas
f71c487025
Merge pull request #96 from utzb/master
...
use seccomp for xenial
Upstream-commit: c216602d16cfefdb175cdb902038789b00dd2cef
Component: packaging
2018-04-10 09:31:15 -07:00
Vincent Demeester
baa55da752
Move integration-cli daemon package to internal/test…
...
… and do not use the `docker` cli in it. One of the reason of this
move is to not make `integration` package using legacy
`integration-cli` package.
Next move will be to support swarm within this package *and* provide
some helper function using the api (compared to the one using cli in
`integration-cli/daemon` package).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f0d277fe84a72b29c0d2d541c20d5a9c4d7e4884
Component: engine
2018-04-10 16:29:48 +02:00
Silvin Lubecki
37bdc4a0ae
Fixed gometalinter errors on test files
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 54f8ca6660
Component: cli
2018-04-10 16:03:56 +02:00
Vincent Demeester
4a24bb90a9
Merge pull request #992 from thaJeztah/bump-version-18.05
...
Bump version to 18.05.0-dev
Upstream-commit: 16eee1dcdc
Component: cli
2018-04-10 11:49:01 +02:00
Andrew Hsu
0657b91bfc
Merge pull request #103 from thaJeztah/bump-golang-1.9.5
...
Bump Golang to 1.9.5
Upstream-commit: f169b1e43aa26020a6a2a2e09ca3d35371b6c50c
Component: packaging
2018-04-09 15:20:59 -07:00
Eli Uriegas
70744081df
Merge pull request #102 from seemethere/arm64_buster
...
Add aarch64 builder for debian-buster
Upstream-commit: 54456bf1ef88a6698744e035d3655c8bcfd8e410
Component: packaging
2018-04-09 15:11:10 -07:00
Sebastiaan van Stijn
87af25ac9e
Bump version to 18.05.0-dev
...
Docker 18.04.0 branch was cut from e6e47d95b5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 341486299a
Component: cli
2018-04-09 13:37:45 -07:00
Vincent Demeester
fe0d099c16
Merge pull request #984 from eiais/trustfish
...
add fish completions for docker trust subcommand
Upstream-commit: ec412bdbb4
Component: cli
2018-04-09 22:29:09 +02:00
Sebastiaan van Stijn
a5ee15c5ef
Merge pull request #978 from bogdananton/fix-manifest-docs-typo
...
[docs] Fix typo in manifest command docs: updated `MANFEST` to `MANIFEST`.
Upstream-commit: 066fd62e37
Component: cli
2018-04-09 13:25:37 -07:00
GordonTheTurtle
080b13b520
Merge component 'engine' from git@github.com:moby/moby master
2018-04-09 17:06:20 +00:00
Dennis Chen
40b08ea4d1
Dockerbuilder: use the arch info from base image
...
Currently we hardcode the architecture to the `runtime.GOARCH` when
building a docker image, this will result in a confusing info if the
arch in the base image is different from the one on the host.
This PR takes use of the arch data from the base image during the build
process, thus we can get consistent arch info between the base image
and the finally built image.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 92b17b10bad1f1788419b70db5d6ed9cdf8d15ef
Component: engine
2018-04-09 10:40:21 +00:00
Vincent Demeester
6d9f00fbde
Merge pull request #36746 from vdemeester/experimental-build-tests
...
Migrate test-integration-cli experimental build tests to integration
Upstream-commit: cbde00b44273a584bed2ee3513db68924b4a6dba
Component: engine
2018-04-09 10:21:03 +02:00
Allen Sun
94172b42d6
refactor: simplify code to make function more readable
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com >
Upstream-commit: a6379399818402be12b9d29e343d348031cbe62f
Component: engine
2018-04-09 15:50:20 +08:00
GordonTheTurtle
6657091b64
Merge component 'engine' from git@github.com:moby/moby master
2018-04-07 17:06:24 +00:00
Akihiro Suda
e45b2e29df
Merge pull request #36808 from justincormack/sys-rw-priv-always
...
Always make sysfs read-write with privileged
Upstream-commit: fb08a5c6c3e68a66f2096d97fdec9455fa007dde
Component: engine
2018-04-07 09:29:23 +09:00
Akihiro Suda
0b3d7f605d
Merge pull request #36806 from adshmh/integration-config-tests-use-unique-names
...
config integration tests use unique resource names
Upstream-commit: 390fd38bcbf6c5ea1456211c31eaee412b0f3f72
Component: engine
2018-04-07 09:28:14 +09:00
GordonTheTurtle
728f075089
Merge component 'cli' from git@github.com:docker/cli master
2018-04-06 16:41:33 +00:00
Justin Cormack
2cf9f7eb88
Always make sysfs read-write with privileged
...
It does not make any sense to vary this based on whether the
rootfs is read only. We removed all the other mount dependencies
on read-only eg see #35344 .
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: a729853bc712910574a7417f67764ec8c523928b
Component: engine
2018-04-06 16:17:18 +01:00
Arash Deshmeh
b7d779bc5e
integration tests under integration/config use unique names when creating resources
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 69481edc0770208f7af96c0eb48c0ab90e4889fb
Component: engine
2018-04-06 06:06:02 -04:00
Anusha Ragunathan
5d0f671bd1
Update examples to reflect docker-runc's runtime root for plugins.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 5fd9eab3d0
Component: cli
2018-04-05 12:14:59 -07:00
Vincent Demeester
74bf31d3e3
Merge pull request #986 from thaJeztah/bump-golang-1.9.5
...
Bump Golang to 1.9.5
Upstream-commit: fe83feeb72
Component: cli
2018-04-05 19:10:23 +02:00
GordonTheTurtle
0814aa2ae5
Merge component 'engine' from git@github.com:moby/moby master
2018-04-05 17:05:49 +00:00
Sebastiaan van Stijn
33403f2a86
Bump Golang to 1.9.5
...
go1.9.5 (released 2018/03/28) includes fixes to the compiler, go command, and
net/http/pprof package. See the Go 1.9.5 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.9.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d3b8ceb52c
Component: cli
2018-04-05 10:02:23 -07:00
GordonTheTurtle
c18ca5abde
Merge component 'cli' from git@github.com:docker/cli master
2018-04-05 16:41:29 +00:00
Sebastiaan van Stijn
89747f2a26
Merge pull request #981 from vdemeester/docs-fix-stack-deploy-reference
...
Fix `docker stack deploy` reference flag
Upstream-commit: 62104e2497
Component: cli
2018-04-05 09:32:41 -07:00
Sebastiaan van Stijn
cb04b581ce
Merge pull request #983 from vdemeester/972-fix-merge-network
...
Fix error with merge composefile with networks…
Upstream-commit: 3eb215c128
Component: cli
2018-04-05 09:31:26 -07:00
Vincent Demeester
96e7de35a2
Fix error with merge composefile with networks…
...
… and other cases too. Updating mergo fixes the bugs (but introduced a
slight behaviour change that had to be fixed too)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0122730faf
Component: cli
2018-04-05 10:37:35 +02:00
odg0318
12207142e4
If Content-Type is application/json;charset=UTF-8, RequestBody is empty.
...
Signed-off-by: odg0318 <odg0318@gmail.com >
Upstream-commit: 6ac73d34e4d8f2b6303f0ed49b58d0a92c19c6f1
Component: engine
2018-04-05 04:03:45 -04:00
Vincent Demeester
d97a287d94
Merge pull request #36769 from stevvooe/defensive-attachment-processing
...
daemon/cluster: handle partial attachment entries during configure
Upstream-commit: 8a9e1808cfdef414e60307b4ccd96719731be304
Component: engine
2018-04-05 09:35:11 +02:00
Anusha Ragunathan
7e2f77eef8
Merge pull request #36728 from darrenstahlmsft/LayerLeak
...
Fix Windows layer leak when write fails
Upstream-commit: a8260058e39f7014f811394f86ae2c0bc899e11e
Component: engine
2018-04-04 19:05:59 -07:00
Sebastiaan van Stijn
a72a47a3d9
Bump Golang to 1.9.5
...
go1.9.5 (released 2018/03/28) includes fixes to the compiler, go command, and
net/http/pprof package. See the Go 1.9.5 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.9.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c62336593118020462d65d4e9784143e07de2da7
Component: packaging
2018-04-04 18:01:28 -07:00
Stephen J Day
95a3a5cb78
daemon/cluster: handle partial attachment entries during configure
...
We have seen a panic when re-joining a node to a swarm cluster. The
cause of the issue is unknown, so we just need to add a test for nil
objects and log when we get the condition. Hopefully this can prevent
the crash and we can recover the config at a later time.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 454128c6e82cded211c1412e3eb350b1f7533ee2
Component: engine
2018-04-04 15:53:14 -07:00
Sebastiaan van Stijn
0dacb7da76
Merge pull request #36779 from thaJeztah/bump-golang-1.9.5
...
Update Golang to 1.9.5
Upstream-commit: a15cbcb3cfc320430c3af027c3e384466cd4c1cf
Component: engine
2018-04-04 13:28:58 -07:00
Darren Stahl
28820945d1
Fix Windows layer leak when write fails
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 1f28844d7869609f371ab2a7881e4488a79a7e27
Component: engine
2018-04-04 12:31:23 -07:00
GordonTheTurtle
3ccf86f831
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-04-04 18:09:40 +00:00