Commit Graph

40481 Commits

Author SHA1 Message Date
f4926a265f Merge pull request #488 from jose-bigio/18.04_version
[18.04] Bump version to 18.04.0-ce-rc2
v18.04.0-ce-rc2
2018-04-04 22:34:43 -07:00
7f624d4fbb Merge pull request #489 from jose-bigio/18.04_changelog
[18.04]  Changelog update
2018-04-04 22:34:21 -07:00
788bd7e0de Merge pull request #491 from cpuguy83/18.04_backport_36711
[18.04] Don't sort plugin mounts slice
2018-04-04 22:33:36 -07:00
754a827543 Merge pull request #493 from andrewhsu/t
[18.04] Expose swarm raft tuning parameters in engine config
2018-04-04 19:07:10 -07:00
7af5eea2a6 Merge pull request #492 from andrewhsu/s
[18.04] Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
2018-04-04 19:06:47 -07:00
04f0435f8f Changelog update
Signed-off-by: jose-bigio <jose.bigio@docker.com>
2018-04-04 17:47:17 -07:00
cb49c70a36 bump defaultReconciliationTimeout to 60 sec
To accomodate for increase in leader election from 3 seconds to 10
seconds. This will give more cycles to find another leader.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f040bf8e51cd76082729340342c7123cdc53d5b8)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-04 23:39:46 +00:00
2a17bd8923 Merge pull request #486 from thaJeztah/18.04-backport-update-containerd-1.0.3
[18.04] containerd: update to 1.0.3 release
2018-04-04 16:38:01 -07:00
c2ba010bf0 Expose swarm raft tuning parameters in engine config
Signed-off-by: David Chung <david.chung@docker.com>
(cherry picked from commit 275a1ca7c8ec1d556c37bb50ac574beffbb16e5a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-04 20:40:15 +00:00
f08871ac09 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>
(cherry picked from commit 27749659d5a30999691e401a351221780a483099)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-04 20:29:10 +00:00
42dab3545d Don't sort plugin mounts slice
This was added as part of a53930a04fa81b082aa78e66b342ff19cc63cc5f with
the intent to sort the mounts in the plugin config, but this was sorting
*all* the mounts from the default OCI spec which is problematic.

In reality we don't need to sort this because we are only adding a
self-binded mount to flag it as rshared.

We may want to look at sorting the plugin mounts before they are added
to the OCI spec in the future, but for now I think the existing behavior
is fine since the plugin author has control of the order (except for the
propagated mount).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ec90839ca302ca53a7d55e4c7f79e7b4779f5e15)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-04-04 08:28:17 -04:00
5a12e3cd82 Merge pull request #485 from andrewhsu/p
[18.04] Make sure plugin container is removed on failure
2018-04-03 14:07:38 -07:00
456461a786 Bump version to 18.04.0-ce-rc2
Signed-off-by: jose-bigio <jose.bigio@docker.com>
2018-04-03 13:51:48 -07:00
88185a70e6 containerd: update to 1.0.3 release
Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit 554d657c1f7a0f4dce51f0d26407fb05a0580fa1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-03 13:33:55 -07:00
7762d78538 Make sure plugin container is removed on failure
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit f81172b9031160218e51fb2a7dbeee19962a60a9)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-03 17:02:29 +00:00
0c7f7c6ff4 Merge pull request #483 from andrewhsu/v
[18.04] bump version to docker-ce 18.04.0 rc1
v18.04.0-ce-rc1
2018-03-28 15:55:13 -07:00
03b5f310ee bump version to docker-ce 18.04.0 rc1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-03-28 11:00:20 -07:00
efd1651c73 Merge pull request #480 from andrewhsu/v
[18.04] bump version to docker-ce 18.04.0-ce-beta1
2018-03-27 17:22:38 -07:00
87da396125 Merge pull request #481 from jose-bigio/18.04_changelog
[18.04] changelog update
2018-03-27 17:22:24 -07:00
05ecbbaa3f Deleted irrelevant changelog entries
Signed-off-by: jose-bigio <jose.bigio@docker.com>
2018-03-27 17:21:36 -07:00
3c0af78681 Merge pull request #482 from andrewhsu/ven
[18.04] vendor: update moby to ed7b6428
2018-03-27 17:19:26 -07:00
9d2aaa8400 vendor: update moby to ed7b6428
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>(cherry picked from commit a1cbaa827b)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-03-27 14:19:59 -07:00
290bbf8158 18.04 changelog
Signed-off-by: jose-bigio <jose.bigio@docker.com>
2018-03-27 13:40:41 -07:00
8d0fc8a2b4 bump version to docker-ce 18.04.0-ce-beta1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-03-27 11:10:44 -07:00
10cad8c455 Bump version to 18.04.0-ce-rc1
Signed-off-by: GordonTheTurtle <engine-team@docker.com>
2018-03-27 17:52:17 +00:00
8a9fee12ae Merge component 'engine' from git@github.com:moby/moby master 2018-03-27 17:07:12 +00:00
f2d857fcec Merge component 'cli' from git@github.com:docker/cli master 2018-03-27 16:41:30 +00:00
610793fe1f Merge pull request #561 from tych0/deprecate-unencrypted-storage
Deprecate unencrypted storage
Upstream-commit: e6e47d95b5
Component: cli
2018-03-27 14:52:03 +02:00
cfbe3fef1b Merge pull request #36704 from thaJeztah/bump-go-digest
Bump go-digest to v1.0.0-rc.1
Upstream-commit: ed7b6428c133e7c59404251a09b7d6b02fa83cc2
Component: engine
2018-03-27 14:31:50 +02:00
e985ce6103 Merge pull request #941 from dnephin/fix-compose-network-name
Fix compose network name
Upstream-commit: 236a84759a
Component: cli
2018-03-26 23:41:44 +02:00
113504a7f3 Merge pull request #35089 from Microsoft/jjh/fromplatformbuilder
LCOW - Change platform parser directive to FROM statement flag
Upstream-commit: 29fc64b590badcb1c3f5beff7563ffd31eb58974
Component: engine
2018-03-26 14:17:49 -07:00
11ecbed64c Merge pull request #36700 from dnephin/remove-myself-as-codeowner
Remove myself from CODEOWNERS
Upstream-commit: e2062f7571babe8ba31f01c3c93bad07b7c0584f
Component: engine
2018-03-26 16:37:22 -04:00
7f54d33379 Bump go-digest to v1.0.0-rc.1
Changes included:

- digest: allow separators in algorithm field
- disallow upper characters (/A-F/) in hex-encoded portion

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 82c44711cc59c150d09c87506a9bd648599ea0d6
Component: engine
2018-03-26 22:17:35 +02:00
ee50259e4c Merge pull request #931 from dnephin/refactor-build-unit-tests
Refactor build tests to re-use more code and not require root
Upstream-commit: d3efe30878
Component: cli
2018-03-26 14:44:13 -04:00
5d37083ce3 Refactor build tests to re-use more code and not require root
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0f1bb35342
Component: cli
2018-03-26 14:27:52 -04:00
80e0c0b83d Remove myself from CODEOWNERS
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 92dfe76911c8ce9beea367e7e906ea138b467135
Component: engine
2018-03-26 13:45:05 -04:00
286d3fed3d Merge component 'engine' from git@github.com:moby/moby master 2018-03-26 17:06:55 +00:00
36283420d9 Merge component 'cli' from git@github.com:docker/cli master 2018-03-26 16:41:30 +00:00
72976c8bb6 print a big warning about cleartext passwords
Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: 4290df3958
Component: cli
2018-03-26 16:18:32 +02:00
6b1c8c09b1 Merge pull request #962 from davidjb/run-docs
Clarify behaviour of restart policy in run ref doc
Upstream-commit: db11cffe37
Component: cli
2018-03-26 13:14:44 +01:00
e222bd5a48 Merge pull request #943 from silvin-lubecki/fix-kubernetes-published-service
Fix docker stack services command Port output
Upstream-commit: 27f66e39f4
Component: cli
2018-03-26 12:50:07 +01:00
95b93fdfcd Merge pull request #36692 from katakonst/unique_names_container_rename_Test
Use unique names for container/rename_test.go
Upstream-commit: 7cfd3f4229c82ba61fa13a8818b8ecf58a2dcdbf
Component: engine
2018-03-26 11:29:01 +01:00
8590eff8c7 Merge pull request #36694 from thaJeztah/update-ripcurld-handle
Update curators list
Upstream-commit: e5eb527ebd773ed3e40fcb0d2b74a37ab807d777
Component: engine
2018-03-26 11:13:58 +01:00
2f8d388ea0 Merge pull request #36646 from anusha-ragunathan/err_return
Add missing error return for plugin creation.
Upstream-commit: 6b3f66c4188b573534a6887668b9fb213cc489e9
Component: engine
2018-03-26 18:34:47 +09:00
744fc0b049 Update curators list
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c85ee9828cb718f2ef83ee3876cef46b9eb3b82c
Component: engine
2018-03-26 10:39:52 +02:00
d1631a824d Use unique names for container/rename_test.go
Signed-off-by: Catalin Pirvu <pirvu.catalin94@gmail.com>
Upstream-commit: 90b514922bb6405bc06428702b1a55bb248bdac3
Component: engine
2018-03-25 21:16:32 +03:00
40d437f5bc Clarify behaviour of restart policy in run ref doc
This clarifies that the behaviour of `unless-stopped` will restart the container on daemon start.  This was implied before, but now the restart-on-daemon-start behaviour is mentioned directly.

Signed-off-by: David Beitey <david@davidjb.com>
Upstream-commit: 8ca237054f
Component: cli
2018-03-26 00:21:40 +10:00
6c4f2b4ad2 Merge component 'engine' from git@github.com:moby/moby master 2018-03-24 17:06:16 +00:00
e3d080dac1 Add missing error return for plugin creation.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 89a882e2f1706e567a8514209701892b40da7a62
Component: engine
2018-03-23 12:07:43 -07:00
6b1f053c14 Merge pull request #36672 from anshulpundir/election
Increase raft ElectionTick to 10xHeartbeatTick
Upstream-commit: 5f17312653c3e4dc5474f86692b09f06262a1ebd
Component: engine
2018-03-23 19:57:24 +01:00