Sebastiaan van Stijn
3923957361
Merge pull request #33152 from cyli/root-ca-rotation-cli-docs
...
Root CA rotation CLI docs
Upstream-commit: 03efb40cb8bc5f2df68cb9616f55138c2abe29b4
Component: engine
2017-05-17 02:17:27 +02:00
Sebastiaan van Stijn
0e311d1c4e
Merge pull request #33151 from nwt/push-foreign-layers
...
Add daemon option to push foreign layers
Upstream-commit: a30ef99e8dd2c3e7a54b6410a5709f61db59c07f
Component: engine
2017-05-17 02:04:31 +02:00
John Stephens
4fcc705035
Merge pull request #33169 from johnstep/windows-configs
...
Add Windows configs support
Upstream-commit: 7658851e74b63fa7a1c3dfa5bf950712cfe72d4e
Component: engine
2017-05-16 16:46:34 -07:00
Tibor Vass
caabf0e2ac
Merge pull request #32388 from nishanttotla/pin-by-digest-on-client-alternative
...
Moving docker service digest pinning to client side
Upstream-commit: d6f4fe9e38b60f63e429fff7ffced9c26cbf8236
Component: engine
2017-05-16 15:24:07 -07:00
Sebastiaan van Stijn
0d712a5a76
Merge pull request #33234 from johnstep/ensure-correct-windows-client
...
Ensure the correct Windows client is built
Upstream-commit: 1290ec2d4b3611293cd993cd12fd9e78e268e296
Component: engine
2017-05-16 23:40:15 +02:00
Noah Treuhaft
67b57727bd
Add daemon option to push foreign layers
...
The --allow-nondistributable-artifacts daemon option specifies
registries to which foreign layers should be pushed. (By default,
foreign layers are not pushed to registries.)
Additionally, to make this option effective, foreign layers are now
pulled from the registry if possible, falling back to the URLs in the
image manifest otherwise.
This option is useful when pushing images containing foreign layers to a
registry on an air-gapped network so hosts on that network can pull the
images without connecting to another server.
Signed-off-by: Noah Treuhaft <noah.treuhaft@docker.com >
Upstream-commit: 67fdf574d5acd6ddccb6ece0ffe0ace1c1608712
Component: engine
2017-05-16 14:36:36 -07:00
John Stephens
0f00ae4912
Add Windows configs support
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: e0d533b1e8a8dd62ed6dff2dfda3c3220e0474b9
Component: engine
2017-05-16 14:25:32 -07:00
John Howard
b3d84804c2
Merge pull request #32208 from johnstep/windows-secrets
...
Add Windows secrets support
Upstream-commit: 55fd0d01156dd421fe4dc7851640fb8a7aa32f86
Component: engine
2017-05-16 13:41:53 -07:00
Brian Goff
3b93d21d8a
Merge pull request #33225 from allencloud/unexport-errPruneRunning
...
unexport error errPruneRunning
Upstream-commit: d6b16508253df96c89025c9ecbd0698f2d909ee7
Component: engine
2017-05-16 15:50:26 -04:00
Brian Goff
4dacea7efb
Merge pull request #33144 from nishanttotla/update-swarmkit-platform-structs
...
Adding Platforms field to TaskSpec Placement
Upstream-commit: 7b7f9a481e21e740263cb43baae9473d888afcba
Component: engine
2017-05-16 15:22:03 -04:00
John Stephens
58d623b06c
Ensure the correct Windows client is built
...
This script builds the client by cloning the repository to a temporary
location and building from there by temporarily changing GOPATH.
However, it was previously building by package name, and a package with
the same name in GOROOT overrides. This update changes the current
directory, and builds from there, instead of specifying a package name.
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: eab0f58661640d4309765755944dc26871f7bb59
Component: engine
2017-05-16 12:13:28 -07:00
Tõnis Tiigi
9ca246ac83
Merge pull request #32959 from simonferquel/tar-filemode-windows
...
Respect tar entries modes when rewriting them on Windows
Upstream-commit: ad846a136a75637c64423d7f9eb0f2f5e433a360
Component: engine
2017-05-16 11:45:42 -07:00
John Stephens
a52518e2ab
Add Windows secrets support
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: bd4e8aa64e5e7dedb60ca6670d7ddb32d5af0db9
Component: engine
2017-05-16 11:30:06 -07:00
Sebastiaan van Stijn
38163ae93c
Merge pull request #33202 from AkihiroSuda/fix-it-on-swarm
...
integration-cli-on-swarm/README.md: add a note about Docker->Moby
Upstream-commit: b5f4fc7162868e64306210fcc6dd33a20765c5fa
Component: engine
2017-05-16 18:59:28 +02:00
Tõnis Tiigi
d9c5a28b93
Merge pull request #33214 from aaronlehmann/pull-prefer-digest
...
Prefer digest over tag on pull
Upstream-commit: c93a48e1382ac1a42b2f3a1d7ad190aaa64c5404
Component: engine
2017-05-16 09:56:00 -07:00
Brian Goff
6d95fe4071
Merge pull request #33209 from cpuguy83/continue_on_err
...
Add continue on error in mountspec backport
Upstream-commit: d12b2387d7d371b543db0c6571b3c686b59d7f4d
Component: engine
2017-05-16 12:54:13 -04:00
allencloud
a934e7d185
unexport error errPruneRunning
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 2a8f46abfdc9a1ebfa2b23a71c75c630c0fc454d
Component: engine
2017-05-16 23:37:30 +08:00
Sebastiaan van Stijn
51c87b76b5
Merge pull request #33023 from gdevillele/pr-fix-prune-filter
...
daemon returns errors when receiving unsupported prune filters
Upstream-commit: f944183c7566de209b4cc1128b63dfd68daac3de
Component: engine
2017-05-16 16:55:10 +02:00
Ying Li
94be5a4238
Document the swarm root CA rotation CLI command.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 3adddab957024f0d1f196c207cdb7eee543dda48
Component: engine
2017-05-15 17:21:01 -07:00
Aaron Lehmann
1157c8047e
Prefer digest over tag on pull
...
If a reference passed to the pull code contains both a tag and a digest,
currently the tag is used instead of the digest in the request to the
registry. This is the wrong behavior. Change it to favor the digest.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0bff591bb0bc5a11ec22eb4f0b6104a79dea0819
Component: engine
2017-05-15 17:17:27 -07:00
Nishant Totla
6b1b90eeb8
Disabling digest pinning for API versions < 1.30
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: c0afd9c873183604e57282e1cf47605c1f1e4d43
Component: engine
2017-05-15 16:42:43 -07:00
Nishant Totla
6b46f385fc
Moving docker service digest pinning to client side
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: c1635c1ae3459e41fea3adb8188d9b3ce94f21a0
Component: engine
2017-05-15 16:42:43 -07:00
Sebastiaan van Stijn
7030b36d75
Merge pull request #33190 from zhangxiaoyu-zidif/format-for-server
...
server.go: format for
Upstream-commit: 6ef7afce83fd24b61d22cbf0e12e03ae0116b706
Component: engine
2017-05-16 01:28:04 +02:00
Aaron Lehmann
2952e551a8
Merge pull request #32490 from aaronlehmann/start-first-test-failure
...
Increase health check timeout for TestAPISwarmServicesUpdateStartFirst
Upstream-commit: df4ca50805baa1d1488d811e82125f607c8daa09
Component: engine
2017-05-15 16:23:05 -07:00
Sebastiaan van Stijn
357711f859
Merge pull request #33148 from cyli/doc-update-node-cluster-tls-info
...
Update the CLI docs to display whether a root rotation is in progress
Upstream-commit: f6c00f6e8098eb331435443d70030dfbe5aeaadb
Component: engine
2017-05-16 01:06:08 +02:00
Nishant Totla
6ca0a8eece
Adding Platforms field to TaskSpec
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 1efbe6e8761370bbe8c136928a68323c7d8dbecf
Component: engine
2017-05-15 14:58:20 -07:00
Sebastiaan van Stijn
32f407ecee
Merge pull request #32730 from abhishek7/hack-folder-readme-32373
...
Adding a README.md for the hack folder.
Upstream-commit: 7535462b77520562396f4cc8d92953dd3a3b9904
Component: engine
2017-05-15 23:53:43 +02:00
Sebastiaan van Stijn
10bae71e4a
Merge pull request #33185 from tonistiigi/docs-build-target
...
docs: add docs for build —target
Upstream-commit: 4dbea104ca7ecaf3b9e7cdd779620f9c4faca818
Component: engine
2017-05-15 22:14:54 +02:00
Kenfe-Mickaël Laventure
54fcd7fc0e
Merge pull request #33198 from vdemeester/remove-unused-opts
...
Remove unused opts (moved to docker/cli)
Upstream-commit: 04eb1f0cacf0ea41caa049ed5ddd0ff71ac9851f
Component: engine
2017-05-15 12:51:40 -07:00
Brian Goff
6ce3bf965e
Add continue on error in mountspec backport
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d6e1cb7cbfe4b604d074814f00f654f5c545a71a
Component: engine
2017-05-15 15:49:07 -04:00
Tibor Vass
f61bb3cd6b
Merge pull request #33208 from johnstep/fix-windows-client-build
...
Fix make.ps1 client build for Windows
Upstream-commit: 203feeed86b3ef82a4d4e4ff4a85d79acd2038ae
Component: engine
2017-05-15 12:45:13 -07:00
John Stephens
37a6b2b6e0
Fix make.ps1 client build for Windows
...
Always clone the client to the docker directory, even if the specified
client repository is a fork. This is simpler than modifying the build
command to specify the package path of the fork.
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 632a8635a0fa0b09759f87fc8a024d99a984c9df
Component: engine
2017-05-15 12:38:10 -07:00
Brian Goff
9322a3476f
Merge pull request #33200 from thaJeztah/remove-unused-key-file
...
Remove unused launchpad key file
Upstream-commit: 55ed80f78abcc7204a6e269d59f4d4bda2f3c5c5
Component: engine
2017-05-15 14:19:19 -04:00
Brian Goff
8a368b7357
Merge pull request #33119 from nhorman/devmapper-fixes
...
Devmapper fixes for cookie generation and error reporting (fixes #33050 )
Upstream-commit: 2c45392b8fe134ef9689488d7e9e00ef711f9ee4
Component: engine
2017-05-15 13:18:52 -04:00
Tonis Tiigi
54b5650fc8
docs: add missing cache-from man docs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 33054be31bd78422b09a3789c99d7aa5d488e61b
Component: engine
2017-05-15 09:58:49 -07:00
Tonis Tiigi
2850502ebe
docs: add docs for build —target
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3377664e947979d2609135761a3c559fe47ef758
Component: engine
2017-05-15 09:56:53 -07:00
Kenfe-Mickaël Laventure
04ea6ad3f6
Merge pull request #32502 from tonistiigi/git-allow-pr-number
...
Allow specifying any remote ref in git checkout URLs
Upstream-commit: ba52bb0fd158dcd99ff65d0a422add8ecde01b3e
Component: engine
2017-05-15 09:34:54 -07:00
Abhishek Sharma
6870cd926f
Adding a README.md for the hack folder.
...
Signed-off-by: Abhishek Sharma <abhishek@asharma.me >
Upstream-commit: 99c1456647d23e7ca39d0af1742db5bacb87df40
Component: engine
2017-05-15 17:06:35 +02:00
Akihiro Suda
0b10be446f
integration-cli-on-swarm/README.md: add a note about Docker->Moby
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 63d4000e97bc0bee706e0831c5b5015ea448e3ae
Component: engine
2017-05-15 14:37:05 +00:00
Sebastiaan van Stijn
fe83ce5181
Merge pull request #33170 from aaronlehmann/vendor-swarmkit-1ede4f8
...
Vendor swarmkit ae29cf2
Upstream-commit: 4d8234fb102d90717db7d4b978671a5fe6cd5eab
Component: engine
2017-05-15 16:16:46 +02:00
Sebastiaan van Stijn
5ebfd27acb
Merge pull request #32821 from cpuguy83/32613_fix_volspec_backport
...
Fix issue backporting mount spec to pre-1.13 obj
Upstream-commit: 6cea2e5206f455d345df98f4a2e4abe8c803ab5a
Component: engine
2017-05-15 15:58:31 +02:00
Brian Goff
e768870c69
Merge pull request #32987 from allencloud/add-swarm-get-unlock-key-test-in-client
...
add swarm get unlock key test for client package
Upstream-commit: 3183031581d16e06b5386b1860ea6bfaa734ebce
Component: engine
2017-05-15 09:56:43 -04:00
Sebastiaan van Stijn
15c0f868cb
Remove unused launchpad key file
...
Commit d841da9379c7d08408c55bfa5d24276826362b23 removed
the dependency on libzfs-dev from the Dockerfile.
This key file was only used for the PPA used to
install libzfs-dev, and is now no longer
needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3b9a6309c8f858f869a6392b6a0a7166b52b363e
Component: engine
2017-05-15 15:51:18 +02:00
Justin Cormack
c9d2f6b467
Merge pull request #33197 from thaJeztah/remove-libzfs-dev-dependency
...
Remove zfs from static builds
Upstream-commit: d841da9379c7d08408c55bfa5d24276826362b23
Component: engine
2017-05-15 14:48:38 +01:00
Sebastiaan van Stijn
f0d9aa77cb
Merge pull request #32856 from darrenstahlmsft/RemoveResourceComments
...
Remove comments and unused structures in Windows resources
Upstream-commit: 6bffb585cda7d4064b803ed3d8b110a7c2d21d94
Component: engine
2017-05-15 15:28:51 +02:00
Sebastiaan van Stijn
5aed6562af
Merge pull request #33131 from johnstep/windows-build-client-temp
...
Build client on Windows in a temporary directory
Upstream-commit: 23359fd4035029c98a329bae5cf78626f3f15419
Component: engine
2017-05-15 15:22:00 +02:00
Vincent Demeester
9b335b3a77
Remove unused opts (moved to docker/cli)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 306074572ca3025820a4a3ad98e327dd51edaf47
Component: engine
2017-05-15 14:38:58 +02:00
Sebastiaan van Stijn
81db28deb9
Merge pull request #32996 from dperny/service-logs-support-details
...
Fix Ambigious Logs Format and Add Support for Details in Service Logs
Upstream-commit: 7fd8a9382c0fd3f23002288e357b5612b869a974
Component: engine
2017-05-15 13:57:44 +02:00
Sebastiaan van Stijn
44195b7547
Merge pull request #33184 from dnephin/doc-arg-before-from
...
Document arg before from
Upstream-commit: 99b5fadd0ce6edf066d5797f14c0ba452c8ddf23
Component: engine
2017-05-15 13:35:23 +02:00
Sebastiaan van Stijn
03266822c8
Remove zfs from static builds
...
The libzfs-dev package is not needed for the static builds,
and only used for ubuntu packages, so removing from
the Dockerfile.
This resolves an issue where build fails due to the PPA
having changed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8022c5fdd12ae6dc5aac3c9e59f5524954b55730
Component: engine
2017-05-15 13:22:52 +02:00