toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,635 Commits 3 Branches 295 Tags
196d64b294eb4f001f1908402d7b1ca3eeeb311c
Commit Graph

34635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda de6daa450d Merge pull request #36339 from thaJeztah/bump-continuity 
Update containerd/continuity to fix ARM 32-bit builds
Upstream-commit: c5e7537d2305c1855f95422f08ca844d05a17aa2
Component: engine
 2018-02-17 15:18:08 +09:00
Sebastiaan van Stijn 75d038d03f Update containerd/continuity to fix ARM 32-bit builds 
This updates the containerd/continuity package to d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
which fixes builds failing on ARM 32-bit, after this dependency was added in
b3aab5e31faf04d8a29f17be55562e4d0c0cb364

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0947a541866ca05b030afe07dd659887a655e3e
Component: engine
 2018-02-17 00:42:10 +01:00
Tibor Vass dcede7a976 Merge pull request #36303 from dnephin/cleanup-in-daemon-unix 
Cleanup unnecessary and duplicate functions in `daemon_unix.go`
Upstream-commit: 747c163a65365933c5d6d7f0740f2ac8e3775287
Component: engine
 2018-02-16 14:55:18 -08:00
Tõnis Tiigi fbcb172e80 Merge pull request #36144 from emil2k/node-id-required 
Produce errors when empty ids are passed into inspect calls. 
Upstream-commit: db360995df97f9d9bcb4eb6a34a5c35a2711795b
Component: engine
 2018-02-16 10:18:47 -08:00
Brian Goff e537ce0b31 Error out on secret/config templates for older API 
Makes sure if the user specifies an older API version that we don't pass
through templating options for versions that templating was not
supported.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a407761e483d9c5ea425a6fd5e55fec03a90485c
Component: engine
 2018-02-16 11:25:14 -05:00
Brian Goff f68c84b9a0 Merge configs/secrets in unix implementation 
On unix, merge secrets/configs handling. This is important because
configs can contain secrets (via templating) and potentially a config
could just simply have secret information "by accident" from the user.
This just make sure that configs are as secure as secrets and de-dups a
lot of code.
Generally this makes everything simpler and configs more secure.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c02171802b788fb2d4d48bebcee2a57c8eabeeaa
Component: engine
 2018-02-16 11:25:14 -05:00
Brian Goff 850e2bff8c Always mount configs with tmpfs 
This makes configs and secrets behavior identical.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e8f5f4457d8e1b02031576dbc18c903be4bcfb6
Component: engine
 2018-02-16 11:25:14 -05:00
Aaron Lehmann 40e1524cb3 daemon: Check return value of createSecretDir 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 426f4e48e3e53b2445835585d7957043a5fe6ab3
Component: engine
 2018-02-16 11:25:14 -05:00
Aaron Lehmann 599f92e497 Store configs that contain secrets on tmpfs 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: cd3d0486a6f62afac50f2cf74e2b9d8728848c97
Component: engine
 2018-02-16 11:25:14 -05:00
Aaron Lehmann 82ebb2a6fd integration-cli: Add secret/config templating tests 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: cdd2e6efdbf402c629844cb20955f160327917b9
Component: engine
 2018-02-16 11:25:13 -05:00
Aaron Lehmann fc6a93f926 api: Add Templating parameter to SecretSpec and ConfigSpec 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c5df7235f6a4811f26b37441db401f6b04858504
Component: engine
 2018-02-16 11:25:13 -05:00
Aaron Lehmann a6e6cffaed executor: Use a TemplatedDependencyGetter to support template expansion 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 56da5fd7d31c9a627fc6a3c482cb0bf0ffb2d26e
Component: engine
 2018-02-16 11:25:13 -05:00
Vincent Demeester 8a28d41c4f Merge pull request #36335 from thaJeztah/sync-libnetwork-commits 
Sync binary commits with vndr
Upstream-commit: 302e584b78db16ea39aca7d7c1612370c50d20f5
Component: engine
 2018-02-16 16:12:53 +01:00
Sebastiaan van Stijn 0a0d1f70a0 Update tomlv for MIT License 
The BurntSushi/toml code is now re-licensed as MIT. While
the vendored package was already updated, the tomlv binary
used was still using the old license type.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 508d5a0bc00400fb41395223cb4c8be3d9b74ade
Component: engine
 2018-02-16 13:42:27 +01:00
Sebastiaan van Stijn 3806697c36 Sync version of userland-proxy with libnetwork vendor 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dcf9e7ee1a6f1b840e05e88aeb1aaf2415af38ad
Component: engine
 2018-02-16 13:41:13 +01:00
Sebastiaan van Stijn d4bbb49d5c Add notes about keeping versions in sync 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 02ca7dc6e91931d6d418cbfa006c0bcf67861ae5
Component: engine
 2018-02-16 13:38:45 +01:00
Vincent Demeester b38d6149be Merge pull request #36306 from cpuguy83/fix_logopt_validator_plugins 
Move log validator logic after plugins are loaded
Upstream-commit: 04d97267b6b57987030862c0d355c9a49eb0e445
Component: engine
 2018-02-16 11:52:23 +01:00
Vincent Demeester ff398aa5c7 Merge pull request #34900 from dnephin/send-codecov-report 
Create and send codecov report
Upstream-commit: 01bfb6d27c6a4b12c777a11c58830a5ef83379a9
Component: engine
 2018-02-16 11:36:51 +01:00
Tonis Tiigi bc08869249 builder: fix wrong cache hits building from tars 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f6c8266afddcf24a2eb629af3b8e924e9c78ce73
Component: engine
 2018-02-15 23:42:42 -08:00
Brian Goff 694d72e031 Merge pull request #36323 from iporsut/remove-getOffsetToReader 
Remove unused method from multireader package
Upstream-commit: 89ce4209bd1fed97e30843f7ce1d4b9866ad2ca6
Component: engine
 2018-02-15 21:12:41 -05:00
Brian Goff 963b00a076 Ensure daemon root is unmounted on shutdown 
This is only for the case when dockerd has had to re-mount the daemon
root as shared.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 487c6c7e73dbb7871e80d75f176dd2a3539a2947
Component: engine
 2018-02-15 15:58:20 -05:00
Daniel Nephin cc3e819977 Merge pull request #36304 from Microsoft/jjh/dontrestoreimageformissinglayer 
Don't restore image if layer does not exist
Upstream-commit: b1a1234c60cf87048814aa37da523b03a7b0d344
Component: engine
 2018-02-15 14:48:36 -05:00
Vincent Demeester a4ed28f439 Merge pull request #36274 from thaJeztah/bump-swarmkit 
Bump SwarmKit to f74983e7c015a38a81c8642803a78b8322cf7eac
Upstream-commit: 1474ec1ecf56a2ec711e42f008cbea4e8287503d
Component: engine
 2018-02-15 18:40:09 +01:00
Brian Goff b4446f4926 Move log validator logic after plugins are loaded 
This ensures that all log plugins are registered when the log validator
is run.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b0b9a25e7e60abbe143e149ccaaf4dfb62044016
Component: engine
 2018-02-15 11:53:11 -05:00
Brian Goff 25714179da Merge pull request #36322 from thaJeztah/fix-build 
Fix import path
Upstream-commit: 7d8fa84e11154bf31644b41c50daaac79f463ad5
Component: engine
 2018-02-15 11:52:38 -05:00
Weerasak Chongnguluam 78ec305ac2 Remove unused method from multireader package 
Signed-off-by: Weerasak Chongnguluam <singpor@gmail.com>
Upstream-commit: 6e5fba98a53a832dc1654d87637df14c5b9ab2f1
Component: engine
 2018-02-15 23:10:56 +07:00
Vincent Demeester e8ddf74a02 Test invalid filter and move validation on top 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 05e7f2cf58bdd6c1aaf3da9a92ebcd54cdde6d09
Component: engine
 2018-02-15 16:24:26 +01:00
Sebastiaan van Stijn 664a0689f9 Fix import path 
The utils package was moved to "internal" in commit
af306d149e76b100e08972cda364647bd7bcfe1e

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ce35439015e4d2190bd82a3b6dfec98f7a12ac90
Component: engine
 2018-02-15 15:29:45 +01:00
Sebastiaan van Stijn 2b13e6eda3 Merge pull request #36318 from yongtang/02152018-docker-py 
Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
Upstream-commit: 1690103906f3e0554a0a9f7ebaadd86363b212f7
Component: engine
 2018-02-15 15:15:23 +01:00
Sebastiaan van Stijn 66a715574f Merge pull request #36055 from cpuguy83/slave_mounts_for_root 
Use rslave propagation for mounts from daemon root
Upstream-commit: ea34f827112b3837e5349827f6309a37217854cb
Component: engine
 2018-02-15 12:57:25 +01:00
Yong Tang 7fad1f8a1a Merge pull request #36320 from yongtang/02142018-diff-tests 
Migrate container diff tests in integration-cli to api tests.
Upstream-commit: 6f8af32f224c986367bc341df8d4abc1a7b6e018
Component: engine
 2018-02-15 03:53:21 -08:00
Yong Tang 90c87d3cd7 Migrate container diff tests in integration-cli to api tests. 
This fix migreates container diff tests in integration-cli
to api tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9537498cedc4e28ee0c8c26ba3d9e59ebb59fcad
Component: engine
 2018-02-15 01:03:29 -08:00
Yong Tang 1903b720b8 Remove docker_cli_diff_test.go from integration-cli 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f19bea20c91e1cd5a748aa241e7083e8c6246634
Component: engine
 2018-02-15 01:03:29 -08:00
Sebastiaan van Stijn bb78e86790 Merge pull request #36298 from arm64b/fix-internal-network-mode 
Fix `DockerNetworkInternalMode` issue
Upstream-commit: e3102d5055995a43b090dbc29342a1846a39edae
Component: engine
 2018-02-15 09:49:15 +01:00
Vincent Demeester f91bc41f1e Merge pull request #36308 from thaJeztah/bump-containerd-1.0.2 
Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c)
Upstream-commit: 41bed9e6d55c39abac701db7a8492026886a95d5
Component: engine
 2018-02-15 09:12:55 +01:00
Vincent Demeester 28ab1221fd Merge pull request #36315 from dnephin/move-commit-to-container-api 
Move commit to container backend
Upstream-commit: d6ac79be3454a3ba34672290218ea5a53b1201a2
Component: engine
 2018-02-15 09:10:52 +01:00
Yong Tang d80026fd7e Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916 
This fix updates docker-py:
```
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
```

The updated docker-py includes https://github.com/docker/docker-py/pull/1909
which is required to have #36292 pass the tests.

Full diff is in https://github.com/docker/docker-py/compare/1d6b5b203222ba5df7dedfcd1ee061a452f99c8a...5e28dcaace5f7b70cbe44c313b7a3b288fa38916.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9d9af83b0fd70ff6a7faa15cf8746669f0f3b588
Component: engine
 2018-02-15 07:43:44 +00:00
Daniel Nephin 0e750709d3 Move commit to container backend 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e574c5ae73f2f54c47319e5e4a17b16bd93213be
Component: engine
 2018-02-14 16:06:12 -05:00
Daniel Nephin a592702237 Remove duplicate rootFSToAPIType 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4ceea53b5e6a86c39122e99f6ffbc1142d28a174
Component: engine
 2018-02-14 11:59:18 -05:00
Daniel Nephin 9e1c0d7187 Remove unnecessary getLayerInit 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c502bcff33e10be55f15366e123b25574016a9af
Component: engine
 2018-02-14 11:59:10 -05:00
Brian Goff 8bb8847f9c Merge pull request #36237 from cpuguy83/zfs_do_not_unmount 
Do not recursive unmount on cleanup of zfs/btrfs
Upstream-commit: 68c3201626439d5be5c24d14d4fe7e27fe93954d
Component: engine
 2018-02-14 09:49:17 -05:00
Brian Goff e156b95318 Merge pull request #35892 from javabrett/dockerfile-on-docker-build-comments 
Updated docker-on-docker build-notes.
Upstream-commit: 62c433cd922a9dbd2b989d098fe331c939fe6b71
Component: engine
 2018-02-14 09:26:59 -05:00
Brett Randall 1d51022fe8 Updated docker-on-docker build-notes. 
These are now more in-line with wiki instructions. Also removes
broken/deprecated make target test-unit.

Signed-off-by: Brett Randall <javabrett@gmail.com>
Upstream-commit: ba49e8c49830b69c833edff3c393716da20f897a
Component: engine
 2018-02-14 22:08:37 +11:00
Akihiro Suda 9ab4ce343a Merge pull request #36305 from cpuguy83/35370_fix_logs_eof 
Fix log tail with empty logs
Upstream-commit: e698b6e098ac696daa1a7a80d4bdac08b305b328
Component: engine
 2018-02-14 16:41:22 +09:00
Vincent Demeester d88a6732e6 Merge pull request #35749 from thaJeztah/change-swagger-install 
Update go-swagger installation steps in Dockerfile
Upstream-commit: 0f6dc962a5ad650dcb3b5a72ce4eb831deacda7b
Component: engine
 2018-02-14 08:20:06 +01:00
Vincent Demeester 16fed85531 Merge pull request #36301 from vdemeester/clean-maintainers 
Remove some maintainers 👼
Upstream-commit: 72d89c25c0c8d5e0e61f3eec92765c2078924ab2
Component: engine
 2018-02-14 08:09:29 +01:00
Dennis Chen b660bf165d Unify the frozen images to the multi-arch version 
Update and unify the `busybox` images on all arches to the `glibc` multi-arch
version and remove the temp workaround on amd64 which uses the old version
busybox (v1.26) before this PR to bypass the failure of those network related
test cases. Also, this PR will fix all the network related issues with `glibc`
version `busybox` image.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: 3a971009763387856bb7f162accdf6714100e39b
Component: engine
 2018-02-14 03:59:04 +00:00
Brian Goff 0fb8610c54 Fix log tail with empty logs 
When tailing a container log, if the log file is empty it will cause the
log stream to abort with an unexpected `EOF`.
Note that this only applies to the "current" log file as rotated files
cannot be empty.

This fix just skips adding the "current" file the log tail if it is
empty.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f40860c5f3d3575629d4a932207e866c1fea625d
Component: engine
 2018-02-13 21:33:05 -05:00
Sebastiaan van Stijn 281df74045 Update containerd dependencies to match 1.0.2 
- https://github.com/containerd/go-runc/compare/ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7...4f6e87ae043f859a38255247b49c9abc262d002f
- https://github.com/containerd/cgroups/compare/29da22c6171a4316169f9205ab6c49f59b5b852f...c0710c92e8b3a44681d1321dcfd1360fc5c6c089
- runc (already ahead)
- https://github.com/stevvooe/ttrpc/compare/76e68349ad9ab4d03d764c713826d31216715e4f...d4528379866b0ce7e9d71f3eb96f0582fc374577

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 175cfdcfb521aa83f6a1441b0a4b99cb159f058d
Component: engine
 2018-02-14 02:13:07 +01:00
Sebastiaan van Stijn 6d509c76c4 Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c) 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c2fb6db55be08da95b15bee730a191094f846577
Component: engine
 2018-02-14 01:35:22 +01:00