d1f6615693
Merge component 'cli' from git@github.com:docker/cli master
2018-04-10 16:41:33 +00:00
4a24bb90a9
Merge pull request #992 from thaJeztah/bump-version-18.05
...
Bump version to 18.05.0-dev
Upstream-commit: 16eee1dcdc
2018-04-10 11:49:01 +02:00
87af25ac9e
Bump version to 18.05.0-dev
...
Docker 18.04.0 branch was cut from e6e47d95b5github@gone.nl >
Upstream-commit: 341486299a
2018-04-09 13:37:45 -07:00
fe0d099c16
Merge pull request #984 from eiais/trustfish
...
add fish completions for docker trust subcommand
Upstream-commit: ec412bdbb4
2018-04-09 22:29:09 +02:00
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
2018-04-09 13:25:37 -07:00
080b13b520
Merge component 'engine' from git@github.com:moby/moby master
2018-04-09 17:06:20 +00:00
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
6657091b64
Merge component 'engine' from git@github.com:moby/moby master
2018-04-07 17:06:24 +00:00
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
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
728f075089
Merge component 'cli' from git@github.com:docker/cli master
2018-04-06 16:41:33 +00:00
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
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
74bf31d3e3
Merge pull request #986 from thaJeztah/bump-golang-1.9.5
...
Bump Golang to 1.9.5
Upstream-commit: fe83feeb72
2018-04-05 19:10:23 +02:00
0814aa2ae5
Merge component 'engine' from git@github.com:moby/moby master
2018-04-05 17:05:49 +00:00
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
2018-04-05 10:02:23 -07:00
c18ca5abde
Merge component 'cli' from git@github.com:docker/cli master
2018-04-05 16:41:29 +00:00
89747f2a26
Merge pull request #981 from vdemeester/docs-fix-stack-deploy-reference
...
Fix `docker stack deploy` reference flag
Upstream-commit: 62104e2497
2018-04-05 09:32:41 -07:00
cb04b581ce
Merge pull request #983 from vdemeester/972-fix-merge-network
...
Fix error with merge composefile with networks…
Upstream-commit: 3eb215c128
2018-04-05 09:31:26 -07:00
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
2018-04-05 10:37:35 +02:00
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
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
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
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
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
3ccf86f831
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-04-04 18:09:40 +00:00
15dcf3ac74
Merge component 'engine' from git@github.com:moby/moby master
2018-04-04 18:09:33 +00:00
bf1e88e279
Merge pull request #98 from seemethere/f28
...
Add packaging code for Fedora 28
Upstream-commit: 9efc79dd124c6c2a07488e68ddbad1558b8e5e30
Component: packaging
2018-04-04 09:44:21 -07:00
7681719a24
Update 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: 0b6f8a7eff325a683b10d64db363da2145aa1c36
Component: engine
2018-04-04 06:59:53 -07:00
e416848066
Merge pull request #36701 from thaJeztah/bump-swarmkit
...
Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
Upstream-commit: 094aa1a5527df23922e1de85919da7ab67455067
Component: engine
2018-04-03 21:22:52 -07:00
119115ef8d
add fish completions for docker trust subcommand
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 4439f6446e
2018-04-03 18:04:04 -07:00
06bbeec2bc
Add packaging code for Fedora 28
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 00148a3c994c753a3e171b1aa2b422342e00fd16
Component: packaging
2018-04-03 23:50:57 +00:00
1e976c5ef2
Merge component 'engine' from git@github.com:moby/moby master
2018-04-03 23:35:47 +00:00
bf5c5d2816
Merge pull request #36749 from stevvooe/update-containerd-1.0.3
...
containerd: update to 1.0.3 release
Upstream-commit: 10ca8d9771fd0d4051cb8291d7980ae909d437f7
Component: engine
2018-04-03 12:07:26 -07:00
b7c2550378
Merge component 'engine' from git@github.com:moby/moby master
2018-04-03 17:06:38 +00:00
dcc0cb0975
Merge component 'cli' from git@github.com:docker/cli master
2018-04-03 16:41:31 +00:00
ebe9fb4969
Merge pull request #36774 from AkihiroSuda/libnetwork-20180403
...
update libnetwork to improve scalabiltiy of bridge network isolation rules
Upstream-commit: eb3f0252d0187d61f591f88be1ac583c910df0e3
Component: engine
2018-04-03 09:21:10 -07:00
2da3a78249
Merge pull request #36762 from zorrorffm/moby_dev
...
Add quotation marks for $CURDIR
Upstream-commit: 6c0d6236117effb139dd3d3edf984877f81e0a94
Component: engine
2018-04-03 10:28:11 +02:00
77bb3ea6e7
Fix docker stack deploy reference flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2ee9635b1e
2018-04-03 10:11:52 +02:00
0b341811fc
update libnetwork to improve scalabiltiy of bridge network isolation rules
...
* libnetwork#2121: Retry other external DNS servers on ServFail
* libnetwork#2125: Fix README flag and expose orphan network peers
* libnetwork#2126: Adding goreport card
* libnetwork#2130: Modify awk to use cut in check_ip_overlap
* libnetwork#2117: [Carry 1534] Improve scalabiltiy of bridge network isolation rules
Full changes: 2bf63300c5...5c1218c956suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b159da19734269c4a162763ebfa28dff07b703f3
Component: engine
2018-04-03 16:50:00 +09:00
6a9a060b45
Merge pull request #979 from joaofnfernandes/docs-secrets-6294
...
Use printf, not echo when creating secrets
Upstream-commit: 17aaad6f06
2018-04-03 09:45:11 +02:00
f323a813e1
Merge pull request #36724 from dnephin/api-docs-add-build-target
...
Add target field to build API docs
Upstream-commit: 045206a45c15625249d7956a6e18d2accaab6383
Component: engine
2018-04-02 22:35:00 -07:00
54e71e814c
Merge pull request #36770 from mrueg/36754-follow-up-test
...
Fix tests for pkg/archive
Upstream-commit: a2db190088a6c11af05023469733f3293c741084
Component: engine
2018-04-03 13:49:48 +09:00
d94b697fa2
Merge pull request #980 from thaJeztah/fix-history-format-placeholder
...
Fix --format example for docker history
Upstream-commit: 4faf9a1736
2018-04-02 20:14:51 -07:00
7b60a70f28
Fix tests for pkg/archive
...
Signed-off-by: Manuel Rüger <manuel@rueg.eu >
Upstream-commit: 108bbd96cb6f9aaa2a761e1a33250f36d58882f9
Component: engine
2018-04-03 01:17:52 +02:00
74a9225ea5
Fix --format example for docker history
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2f7bf40e73
2018-04-02 16:07:40 -07:00
314f0caa92
Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
...
Changes included:
- Ingress network should not be attachable
- [manager/state] Add fernet as an option for raft encryption
- Log GRPC server errors
- Log leadership changes at manager level
- [state/raft] Increase raft ElectionTick to 10xHeartbeatTick
- Remove the containerd executor
- agent: backoff session when no remotes are available
- [ca/manager] Remove root CA key encryption support entirely
- Fix agent logging race (fixes https://github.com/docker/swarmkit/issues/2576 )
- Adding logic to restore networks in order
Also adds github.com/fernet/fernet-go as a new dependency
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 27749659d5a30999691e401a351221780a483099
Component: engine
2018-04-02 15:17:38 -07:00
15ef970018
Use printf, not echo when creating secrets
...
Update the docs so that users don't use `echo` when creating
secrets from STDIN. `echo` adds a trailing new line, so users
will probably be confused when their passwords don't work.
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: 5238f3e93e
2018-04-02 15:15:19 -07:00
35efc4d5f1
containerd: update to 1.0.3 release
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 554d657c1f7a0f4dce51f0d26407fb05a0580fa1
Component: engine
2018-04-02 13:42:49 -07:00
1841491e85
Merge pull request #36745 from arm64b/fix-misused-nwname
...
Fix a misused network object name
Upstream-commit: 785b3e32876e10d638d9b1bae00e3f340a2f47ec
Component: engine
2018-04-02 10:35:20 -07:00
