starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-04 02:24:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
35,158 Commits 13 Branches 322 Tags
ee3ee2f6b0792aeff8a2fdd64fed30e19b67a5ea
Commit Graph
3127 Commits
Author SHA1 Message Date
Grant MillarandSebastiaan van Stijn 4f52a192ac Fix swagger file type for ExecIds 
Signed-off-by: Grant Millar <grant@seednet.eu>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 58a35eaede4b121cd57cdb41e67d3654a90a144a
Component: engine
 2018-05-19 22:14:38 +02:00
Sebastiaan van StijnandGitHub 3b0918309f Merge pull request #37088 from ohbarye/fix-typos-duplicated-the 
Fix typos: remove duplicated "the"
Upstream-commit: 3646562a5cfbf93f987d0ccffe7ca1c3487036e2
Component: engine
 2018-05-19 20:57:47 +02:00
Tibor VassandGitHub 1ed95ff31a Merge pull request #37091 from thaJeztah/fix-linting-errors 
Fix some linting issues
Upstream-commit: 1b75e175842e5ef59284a1c8ca7d64e4d6b62384
Component: engine
 2018-05-19 08:39:39 -10:00
Sebastiaan van Stijn 7f78f7fe15 Fix some linting issues 
These showed locally when running `make validate`. CI doesn't seem to have the
same (possibly it's disabled in the configuration)

    builder/fscache/fscache.go:618::error: github.com/docker/docker/vendor/github.com/tonistiigi/fsutil.StatInfo composite literal uses unkeyed fields (vet)
    client/swarm_unlock_test.go:44::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
    client/swarm_unlock_test.go:20::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
    cmd/dockerd/daemon_unix.go:113::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
    cmd/dockerd/daemon_unix.go:110::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay/overlay.go:171::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay/overlay.go:413::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay2/overlay.go:203::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay2/overlay.go:584::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/zfs/zfs.go:109::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/zfs/zfs.go:388::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/volumes_windows.go:27::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    integration/service/network_test.go:31::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
    api/server/server.go:129:10⚠️ should not use basic type string as key in context.WithValue (golint)
    integration/service/network_test.go:54::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
    libcontainerd/client_daemon_linux.go:61::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    libcontainerd/client_daemon_linux.go:74::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    pkg/archive/archive_windows.go:76::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    plugin/manager_linux.go:56::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f8c870d623c63b98f8ef8002448f07f4dda4aa9
Component: engine
 2018-05-17 19:28:27 +02:00
AJ BowenandSebastiaan van Stijn 17b1295241 Highlight meaning of 'precpu' (i.e. 'previous'). 
Signed-off-by: AJ Bowen <aj@soulshake.net>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b7fe0b6359dcbefd269c13ee4649d9247539cd18
Component: engine
 2018-05-17 14:57:44 +02:00
ohbarye 111037b920 Fix typos: remove duplicated "the" 
Signed-off-by: Masato Ohba <over.rye@gmail.com>
Upstream-commit: 0f95b23d98384a3ae3769b75292cd5b14ba38437
Component: engine
 2018-05-17 21:49:51 +09:00
emanb29andSebastiaan van Stijn 8373fcb573 Describe IP field of Port definition 
Signed-off-by: Ethan Bell <ebgamer29@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 13e0b2651082878f8f17669df3f97ab252a9e095
Component: engine
 2018-05-15 12:09:42 +02:00
Brian Goff 1cb0dc30a7 Fix swagger volume type generation 
This was broken by bf6a790f00ab96bb8857e3c73502909ee5e36217

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b16b125bb4326e2eec9948fd54ca8c5d83eba36a
Component: engine
 2018-05-14 13:46:20 -04:00
Kir Kolyshkin e3af8e0774 Switch from x/net/context -> context 
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".

Many vendored packages still use x/net/context, so vendor entry remains
for now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 7d62e40f7e4f3c17d229a7687d6fcca5448de813
Component: engine
 2018-04-23 13:52:44 -07:00
Wassim Dhif 3e4ba6ca0d Fix version mismatch in API documentation 
Fix a version mismatch in the API documentation.

Signed-off-by: Wassim DHIF <wassimdhif@gmail.com>
Upstream-commit: 2058928edc284653b1fb8e719d713ac7edecd091
Component: engine
 2018-04-23 18:57:35 +02:00
Vincent Demeester 3da083e7f4 Remove daemon dependency on api packages 
We are using interface in the api routers to not explicitely depend on
the daemon struct (`daemon.Daemon`), but somehow, we do depend on the
`daemon` package for the cluster functionalities.

This removes this dependency by defining the correct interfaces.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f4106b46db47524b4f38abeee48137d42e3fe4eb
Component: engine
 2018-04-20 11:06:40 +02:00
Anusha RagunathanandGitHub 32a14263cf Merge pull request #35831 from anusha-ragunathan/splunk_partial 
Improve partial message support in logger
Upstream-commit: 9689059b5636f23d77cc3ac29ee41c6fabff81ec
Component: engine
 2018-04-12 17:38:27 -07:00
Anusha Ragunathan e844cef5f8 Improve partial message support in logger 
Docker daemon has a 16K buffer for log messages. If a message length
exceeds 16K, it should be split by the logger and merged at the
endpoint.

This change adds `PartialLogMetaData` struct for enhanced partial support
- LastPartial (bool) : indicates if this is the last of all partials.
- ID (string)        : unique 32 bit ID. ID is same across all partials.
- Ordinal (int starts at 1) : indicates the position of msg in the series of partials.
Also, the timestamps across partials in the same.

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 0b4b0a7b5d5de8cb575b666312fceaa2cd58e658
Component: engine
 2018-04-11 13:26:28 -07:00
Sebastiaan van StijnandGitHub 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
Brian Goff 9b41292c7f Support cancellation in directory.Size() 
Makes sure that if the user cancels a request that the daemon stops
trying to traverse a directory.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9d46c4c138d7b3f7778c13fe84857712bd6c97a9
Component: engine
 2018-03-29 15:49:15 -04:00
Daniel Nephin 59210a575a Add target field to build API docs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 95ccb55fe281fdccb996b0b82befcb3998beac25
Component: engine
 2018-03-28 14:34:58 -04:00
Daniel Nephin 60daf5fa97 Automated migration using 
gty-migrate-from-testify --ignore-build-tags

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6be0f709830113966f295401327b027ec2f0bbca
Component: engine
 2018-03-16 11:03:43 -04:00
Emil Davtyan 71ca3e138f Content encoding negotiation added to archive request. 
Signed-off-by: Emil Davtyan <emil2k@gmail.com>
Upstream-commit: 117cd7ff640d5e58229eb7f6588d01b928a30607
Component: engine
 2018-02-24 06:41:45 +01:00
Sebastiaan van Stijn e09ff74ed5 Adjust minimum API version for templated configs/secrets 
Also adds a note to the API version history

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a3efeaad529b945ce5af78c4b08a6ed47399f8d5
Component: engine
 2018-02-21 15:23:00 +01:00
Sebastiaan van Stijn 40a7a5b6d7 Bump default API version to 1.37 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 453f2b8b40b923862ce1c08c11531ff5042770f1
Component: engine
 2018-02-21 15:22:40 +01:00
Sebastiaan van StijnandGitHub a196815f55 Merge pull request #33702 from aaronlehmann/templated-secrets-and-configs 
Templated secrets and configs
Upstream-commit: 0076343b29f508a5deb06861c0d85748659f8881
Component: engine
 2018-02-21 13:39:10 +01:00
Akihiro Suda ed5d3f9cce Support SCTP port mapping (bump up API to v1.37) 
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 8e435b8279f2af3e0cebd73fa9e25ca1bb26004e
Component: engine
 2018-02-20 11:15:36 +09: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 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 LehmannandBrian Goff 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
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
John StephensandGitHub 25813b19fa Merge pull request #36269 from Microsoft/jjh/remove-lcow-api-platform-if-omitted 
Remove interim env var LCOW_API_PLATFORM_IF_OMITTED
Upstream-commit: 04cb98e6b5e5bd9dac0b92fcc13966498053aa7e
Component: engine
 2018-02-13 15:12:18 -08:00
Brian GoffandGitHub f914512cd5 Merge pull request #36271 from dnephin/use-tag-image-in-commit 
Use TagImage in Commit
Upstream-commit: 060893ab5d97d6582770224db3623ad1b3bdb6e1
Component: engine
 2018-02-13 16:40:17 -05:00
Yong TangandGitHub 228b4fffc0 Merge pull request #36246 from sirreal/fix/swagger-buildargs-type 
Fix string type for buildargs API definition
Upstream-commit: 9cbe066e2709cb98ff44b687c2fba1956ff95872
Component: engine
 2018-02-12 11:21:42 -08:00
Jon Surrell 4816de08ce Add example buildargs usage 
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
Upstream-commit: 344c73ac672cd4d4f70a08b5a41b6835d9873926
Component: engine
 2018-02-12 14:09:37 +01:00
Jon Surrell 535cb21e7e Reformat to multi-line 
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
Upstream-commit: de2b2b5e4ba0cb297d47a7b05614190fa44f54a2
Component: engine
 2018-02-12 14:09:31 +01:00
Daniel Nephin 8382b77c1c Use TagImage in Commit 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: afb3eda697efebf18d8ac3bbcfd911a5968081e3
Component: engine
 2018-02-09 20:53:39 -05:00
John Howard d3c6f2e0ef Remove interim env var LCOW_API_PLATFORM_IF_OMITTED 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c111fec758770a37e8674cac312e528e85d89428
Component: engine
 2018-02-09 12:05:07 -08:00
Akihiro SudaandGitHub e09b72af21 Merge pull request #36224 from dnephin/refactor-commit 
Refactor Daemon.Commit()
Upstream-commit: 9769ef333f2af24b30fed0dd7b00384b2df3b953
Component: engine
 2018-02-08 21:02:30 +09:00
Jon SurrellandJon Surrell 8ea0c8eb22 Fix string type for buildargs API definition 
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
Upstream-commit: f281358ba2de6204a61cdb062fa67a8b7134739c
Component: engine
 2018-02-08 13:00:24 +01:00
Daniel Nephin 4ec1fd107e Refactor commit 
The goal of this refactor is to make it easier to integrate buildkit
and containerd snapshotters.

Commit is used from two places (api and build), each calls it
with distinct arguments. Refactored to pull out the common commit
logic and provide different interfaces for each consumer.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: daff039049aea6e19a4bda1df2834d14b4198bc0
Component: engine
 2018-02-07 15:09:06 -05:00
Daniel Nephin be83c11fb0 Add canonical import comment 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067
Component: engine
 2018-02-05 16:51:57 -05:00
Yong TangandGitHub 99a67602d2 Merge pull request #36146 from yongtang/36142-TaskState 
Add `REMOVE` and `ORPHANED` to TaskState
Upstream-commit: 3a6f8cfd5108aa3fac145525b7cd2f4f0439702d
Component: engine
 2018-02-02 11:33:25 -08:00
Yong Tang 877ec711a0 Fix issue of ExitCode and PID not show up in Task.Status.ContainerStatus 
This fix tries to address the issue raised in 36139 where
ExitCode and PID does not show up in Task.Status.ContainerStatus

The issue was caused by `json:",omitempty"` in PID and ExitCode
which interprate 0 as null.

This is confusion as ExitCode 0 does have a meaning.

This fix removes  `json:",omitempty"` in ExitCode and PID,
but changes ContainerStatus to pointer so that ContainerStatus
does not show up at all if no content. If ContainerStatus
does have a content, then ExitCode and PID will show up (even if
they are 0).

This fix fixes 36139.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9247e09944a4c7f3c2f3f20f180c047a19fb6bae
Component: engine
 2018-01-31 15:35:19 +00:00
Yong Tang fe18510901 Add REMOVE and ORPHANED to TaskState 
This fix tries to address the issue raised in 36142 where
there are discrepancies between Swarm API and swagger.yaml.

This fix adds two recently added state `REMOVE` and `ORPHANED` to TaskState.

This fix fixes 36142.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a40687f5ac7df27bc6c6c3a6f69513a397a1a05a
Component: engine
 2018-01-30 16:46:05 +00:00
Sebastiaan van StijnandGitHub f0d03ada35 Merge pull request #35946 from joelwurtz/patch-2 
Fix Volumes property definition in ContainerConfig
Upstream-commit: 40a9d5d24cda0d938f3c41dceef41b97b6b4e847
Component: engine
 2018-01-29 20:57:09 -08:00
Yong TangandGitHub 7b9944fc04 Merge pull request #36074 from shutefan/master 
Update API docs to show that /containers/{id}/kill returns HTTP 409
Upstream-commit: 958200970f4c52fd093aa913632d2d2b79ebf969
Component: engine
 2018-01-28 08:32:35 -08:00
Yong TangandGitHub 39f9f3f6e3 Merge pull request #34655 from nmeyerhans/document-init-api 
Add Init API field documentation to swagger
Upstream-commit: 093a5402a041e9648d03d3e6545fa255e8fe96b2
Component: engine
 2018-01-25 10:16:27 -08:00
Sebastiaan van StijnandGitHub 0a23b8e672 Merge pull request #35989 from dani-docker/orca-11380 
verbose info is missing for partial overlay ID
Upstream-commit: 2b2265acbb7b1457cd6657a5e4e5503472b306d1
Component: engine
 2018-01-24 16:01:31 -08:00
Noah MeyerhansandVincent Demeester a42cb7a60a Add Init API field documentation to swagger 
Signed-off-by: Noah Meyerhans <nmeyerha@amazon.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 467ea71e5e2a0142c1456e3280d69a9538402fec
Component: engine
 2018-01-24 09:46:12 -08:00
Yong Tang 74da78f854 Fix network alias issue 
This fix tries to address the issue raised in 33661 where
network alias does not work when connect to a network the second time.

This fix address the issue.

This fix fixes 33661.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d63a5a1ff593f14957f3e0a9678633e8237defc9
Component: engine
 2018-01-23 01:04:33 +00:00
Dani Louca 9e00f0f8fa fix verbose for partial overlay ID 
Signed-off-by: Dani Louca <dani.louca@docker.com>
Upstream-commit: 2e0990f1655d151b741e7f7f78ac55e14398339f
Component: engine
 2018-01-22 18:50:49 -05:00
Vincent DemeesterandGitHub 928478219f Merge pull request #36013 from thaJeztah/improve-version-middleware-test 
Improve API version-middleware test
Upstream-commit: fbed4eb8c72f56437f2a451f9cd9405814882e2a
Component: engine
 2018-01-22 14:59:06 -08:00
shutefanandStephan Spindler 5d42f5ba8b Update API docs to show that /containers/{id}/kill returns HTTP 409 
Signed-off-by: Stephan Spindler <shutefan@gmail.com>
Upstream-commit: 3a1bb49b41901dd21ab9489937656ab935a690e0
Component: engine
 2018-01-20 17:21:49 +01:00
Vincent DemeesterandGitHub 946a37c1e4 Merge pull request #35744 from ndeloof/35702 
closes #35702 introduce « exec_die » event
Upstream-commit: f97256cbf1811740cfa9a72f705c8a70195cd468
Component: engine
 2018-01-19 15:03:50 -08:00