b92b043ac1
Re-vendors swarmkit to include the following fix:
...
- https://github.com/docker/swarmkit/pull/2323 (fix for watch server being run only on leader)
Signed-off-by: Ying <ying.li@docker.com >
2017-07-25 16:16:43 -07:00
1c65e20e5b
Merge pull request #136 from cyli/re-vendor-swarmkit-17.07
...
[17.07] Re-vendor swarmkit
2017-07-25 15:23:43 -07:00
1fef2502d2
Merge pull request #131 from vieux/backport-fix-live-restore
...
[17.07] Graceful upgrade of containerd and runc state files upon live-restore
2017-07-25 15:19:55 -07:00
edadfd04be
Merge pull request #137 from seemethere/cherry_pick_packaging_3_11_40_41
...
[17.07] Cherry pick latest packaging commits
2017-07-25 14:02:47 -07:00
83e8a29ede
Removes telemetry mentions from Fedora 26
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit a8c7e75bfd263b2f7445b06f749aba13aaeac789)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 11:29:40 -07:00
0ff00e73c9
End Ubuntu 16.10 (Yakkety) support
...
Ubuntu 16.10 (Yakkety) reached it's "End of Life" on July 20, 2017:
http://fridge.ubuntu.com/2017/07/20/ubuntu-16-10-yakkety-yak-end-of-life-reached-on-july-20-2017/
As such we are removing support for the distribution for future versions
of Docker packages.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 36cc14cd480879391eeb9f470417698618f4cdb3)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:31:41 -07:00
32709fc76b
Update spec to align with new spec files
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit feb2f647c5570753a607b71bb476028c8d1b4e55)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:30:18 -07:00
95fa7a2d20
Update go version, add distro/suite tags
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 26b1bd9f3da46b907021ae66d310405057e29634)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:30:18 -07:00
22f30a8bb1
build fedora 26 packages
...
Just released: https://docs.fedoraproject.org/en-US/Fedora/26/html/Release_Notes/
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
(cherry picked from commit 412824b465d8334278bb9c02f0a5ee3d294826fd)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:30:16 -07:00
e5f33c5d16
Revert "Added the metrics plugin to the RPM/DEB packages"
...
This reverts commit ceac22bf2240df483b1d3bd3a19ac681e665f910.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit bda73f99e455bd3f041ccc843f094186ca8b8623)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:20:14 -07:00
c203be7748
Tell build-deb to throw up errors
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 3618e4aa262f154f79c804752d69110772e636a3)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:19:29 -07:00
b9b61ead5a
Add raspbian deb packages
...
(cherry picked from commit 1c61fdcafc4f6fa0e41c267cd857d0b60d3a2dbd)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:19:20 -07:00
8ddc1eeedd
Added the metrics plugin to the RPM/DEB packages
...
- centos
- fedora
- ubuntu
- debian
Signed-off-by: Roberto Gandolfo Hashioka <roberto_hashioka@hotmail.com >
(cherry picked from commit ceac22bf2240df483b1d3bd3a19ac681e665f910)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-25 10:18:39 -07:00
1dd11b3bb6
Re-vendors swarmkit to include the following fixes:
...
- https://github.com/docker/swarmkit/pull/2288 (Allow updates of failed services with restart policy "none")
- https://github.com/docker/swarmkit/pull/2304 (Reset restart history when task spec changes)
- https://github.com/docker/swarmkit/pull/2309 (updating the service spec version when rolling back)
- https://github.com/docker/swarmkit/pull/2310 (fix for slow swarm shutdown)
Signed-off-by: Ying <ying.li@docker.com >
2017-07-24 18:01:58 -07:00
1b065d3124
[engine] Graceful upgrade of containerd and runc state files upon live-restore
...
Vendors new dependency github.com/crosbymichael/upgrade
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 358c36e930victorvieux@gmail.com >
2017-07-24 16:51:35 -07:00
bd4b12ce5d
Merge pull request #128 from seemethere/cherry_pick_packaging_37
...
[17.07.x] Change make -C to a cd command
2017-07-24 14:57:23 -07:00
c249bb0aea
Change make -C to a cd command
...
Tried out make -C in this scenario and it did not seem to function
correctly, changed to cd.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 3a548f8815d5308b197abea1e39f0a0a4939c4f2)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-24 14:36:41 -07:00
cb16f8905b
Merge pull request #126 from seemethere/cherry_pick_moby_34206
...
[17.07.x] Add go-autogen to integration tests
2017-07-21 15:26:19 -07:00
c4d547ce61
Add go-autogen to integration tests
...
Integration test were failing in trial runs for docker-ce 17.07 due to
the lack of go-autogen being sourced in `hack/make.sh`. This re-adds
go-autogen to be sourced for test-integration-cli so that we can
actually run tests without the error found in:
https://github.com/moby/moby/pull/33857
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 3cdd471cac8193c34d8483255065c6c28a7b1645)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-21 14:41:26 -07:00
00313efde4
Merge pull request #123 from seemethere/cherry_pick_packaging_25
...
[17.07] Add ubuntu-xenial aarch64 Dockerfile
2017-07-20 16:35:08 -07:00
8bd577e801
Add ubuntu-xenial aarch64 Dockerfile
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
(cherry picked from commit 94cbc76b701b8b108f6a337b1695bd664f441bdc)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-20 16:33:08 -07:00
24244c1083
Merge pull request #122 from seemethere/fix_1707_version
...
[17.07.x] Increment engine version to 17.07.0-dev
2017-07-20 15:20:35 -07:00
4ca7fba8e3
Increment engine version to 17.07
...
Release jobs will fail if the version files are out of sync due to how
`hack/make.sh` builds binaries (putting them into the version folder
according to `components/engine/VERSION` instead of the base `VERSION`
file)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-07-20 14:44:56 -07:00
74c07ebc84
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-07-20 00:22:07 +00:00
cc15b49a4c
Merge pull request #33 from tophj-ibm/s390x-add-seccomp
...
[s390x] add seccomp buildtag for ubuntu-yakkety
Upstream-commit: 795c44b6edfd158443b9ce501130b2e9776ab04a
Component: packaging
2017-07-19 17:21:19 -07:00
d9af0bcff1
Merge component 'engine' from git@github.com:moby/moby master
2017-07-20 00:09:53 +00:00
d266af160b
Merge component 'cli' from git@github.com:docker/cli master
2017-07-19 23:39:56 +00:00
21a816c87d
Merge pull request #34183 from thaJeztah/api-changelog-add-volume-created-at
...
Update API history and example response for volume CreatedAt
Upstream-commit: 8299f1727884c7ec41f21e70906d5b3a39fa7feb
Component: engine
2017-07-19 22:13:34 +02:00
5febff914b
Merge pull request #34172 from aaronlehmann/swagger-configs
...
api: Update swagger.yaml for configs
Upstream-commit: 86b77bd9ddb49ce943d987932694a6751d9de2a3
Component: engine
2017-07-19 22:09:31 +02:00
8830d4f1ff
api: Update swagger.yaml for configs
...
Also fix bad reference to ServiceSpec.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: ea1d14a189d62df34427b037a6d043ae3028760b
Component: engine
2017-07-19 09:52:25 -07:00
edb54ff5f9
Merge pull request #34071 from FengtuWang/pause
...
Keep pause state when restoring container's status
Upstream-commit: 4309075610dc3c8e68237d399423325b8dd9f242
Component: engine
2017-07-19 17:49:38 +02:00
0112a044fc
Update API history and example response for volume CreatedAt
...
This adds the new `CreatedAt` field to the API version history
and updates some examples to show this information.
The `CreatedAt` field was implemented in a46f757c4043031379362c5d6b3bad7562ab9fed
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 48a83a3a18185e0ad48737d448524670f8fac4bf
Component: engine
2017-07-19 16:18:08 +02:00
ba4262a451
Merge pull request #32453 from cpuguy83/default_enable_pprof
...
Enable pprof/debug endpoints by default
Upstream-commit: eb9e5cd14bbe9b21e1774d92e2023197869d7401
Component: engine
2017-07-19 16:13:12 +02:00
ae4cfec3e4
Merge pull request #34168 from Microsoft/jjh/dodgytest
...
Windows: Disable TestAttachTTYWithoutStdin
Upstream-commit: 24bb61145cf380f90435d02daa485c5921a51c67
Component: engine
2017-07-19 10:19:15 +02:00
d160314d93
Merge pull request #34171 from thaJeztah/fix-secrets-api-docs
...
Fix API docs for GET /secrets/{id}, GET /secrets
Upstream-commit: a2202d5d5d22dedd67734c468b02b43aade6385b
Component: engine
2017-07-19 10:18:09 +02:00
7145299da3
Merge pull request #356 from dnephin/fix-codeowners
...
Fix .github/CODEOWNERS patterns
Upstream-commit: 7f684c7512
2017-07-18 17:08:37 -07:00
e4c6e38322
Fix CODEOWNERS patterns.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cea8b4f4f3
2017-07-18 18:25:55 -04:00
21d120121d
Fix API docs for GET /secrets/{id}, GET /secrets
...
The swagger.yml defined these endpoints to return
a "ServiceSpec" instead of a "SecretSpec".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f6954bea9f28c62c50b88c895968045cf801aa81
Component: engine
2017-07-19 00:22:05 +02:00
416ca06159
Windows: Disable TestAttachTTYWithoutStdin
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e4ec9195fed2f3653ec6d0a2b1c9ca6b0e2b9c37
Component: engine
2017-07-18 14:23:23 -07:00
b58bd71384
Merge pull request #34135 from tklauser/more-unix-fns
...
Replace manually written wrappers by functions from x/sys/unix
Upstream-commit: fa7db52e2603cefbf0faf4e5d525e48cfe4a3c52
Component: engine
2017-07-18 20:43:13 +02:00
7419227176
Merge pull request #351 from dnephin/misc-cleanup
...
Misc cleanup of dockerfiles and circleci
Upstream-commit: 257e113542
2017-07-18 10:44:51 -07:00
b069176a2d
Merge pull request #34146 from kolyshkin/vasprintf
...
devmapper_wrapper.go: fix gcc warning
Upstream-commit: 72959fc2161fdcd785ad54a38cd03049250236fb
Component: engine
2017-07-18 12:46:23 -04:00
7c2dc55ca3
Remove unnecessary prune function aliases.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ff350a04cb
2017-07-18 12:25:45 -04:00
29e4b6071d
Cleanup dockerfiles and circle
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f91d9e6c4
2017-07-18 12:22:28 -04:00
79a4b353ef
Merge pull request #34157 from twistlock/plugable_secrets_backend
...
plugable secret backend
Upstream-commit: 0304c98d85404fe75a1b4a35d3c111931e062f41
Component: engine
2017-07-18 18:07:27 +02:00
c912542d4f
Merge pull request #350 from thaJeztah/unexport-commands
...
Unexport subcommands
Upstream-commit: a14762c6d2
2017-07-18 17:17:01 +02:00
fa129caef8
Merge pull request #341 from thaJeztah/small-prune-refactor
...
Small refactor in system prune
Upstream-commit: 3209cb8da6
2017-07-18 10:45:21 -04:00
ea84db7e56
Unexport subcommands
...
These commands were only used as subcommands, so did
not have to be exported.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9c7b0d74cd
2017-07-18 15:26:45 +02:00
7e5b932e43
Small refactor in system prune
...
Adapt "image prune" and "build cache prune" to have
the same signature as the other prune commands, so
that they can all be added to the "pruneFuncs" array.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 73163ee78b
2017-07-18 15:13:11 +02:00
6250958cd7
Merge pull request #315 from ripcurld0/nat_sort
...
Sort swarm stacks and nodes using natural sorting
Upstream-commit: 79e4d635ca
2017-07-18 15:01:11 +02:00
