0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
35165 commits 14 branches 412 tags 338 MiB
Commit graph

3129 commits

Author SHA1 Message Date
Vincent Demeester
da99009bbb
Merge pull request #35402 from thaJeztah/fix-GetTimestamp-parsing 
Improve GetTimestamp parsing
 2018-05-22 12:28:01 +02:00
Sebastiaan van Stijn
48cfe3f087
Improve GetTimestamp parsing 
`GetTimestamp()` "assumed" values it could not parse
to be a valid unix timestamp, and would use invalid
values ("hello world") as-is (even testing that
it did so).

This patch validates unix timestamp to be a valid
numeric value, and makes other values invalid.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-05-20 13:07:17 +02:00
Grant Millar
58a35eaede Fix swagger file type for ExecIds 
Signed-off-by: Grant Millar <grant@seednet.eu>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-05-19 22:14:38 +02:00
Sebastiaan van Stijn
3646562a5c
Merge pull request #37088 from ohbarye/fix-typos-duplicated-the 
Fix typos: remove duplicated "the"
 2018-05-19 20:57:47 +02:00
Tibor Vass
1b75e17584
Merge pull request #37091 from thaJeztah/fix-linting-errors 
Fix some linting issues
 2018-05-19 08:39:39 -10:00
Sebastiaan van Stijn
4f8c870d62
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>
 2018-05-17 19:28:27 +02:00
AJ Bowen
b7fe0b6359
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>
 2018-05-17 14:57:44 +02:00
ohbarye
0f95b23d98 Fix typos: remove duplicated "the" 
Signed-off-by: Masato Ohba <over.rye@gmail.com>
 2018-05-17 21:49:51 +09:00
emanb29
13e0b26510
Describe IP field of Port definition 
Signed-off-by: Ethan Bell <ebgamer29@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-05-15 12:09:42 +02:00
Brian Goff
b16b125bb4 Fix swagger volume type generation 
This was broken by bf6a790f00

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-05-14 13:46:20 -04:00
Kir Kolyshkin
7d62e40f7e 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>
 2018-04-23 13:52:44 -07:00
Wassim Dhif
2058928edc Fix version mismatch in API documentation 
Fix a version mismatch in the API documentation.

Signed-off-by: Wassim DHIF <wassimdhif@gmail.com>
 2018-04-23 18:57:35 +02:00
Vincent Demeester
f4106b46db
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>
 2018-04-20 11:06:40 +02:00
Anusha Ragunathan
9689059b56
Merge pull request #35831 from anusha-ragunathan/splunk_partial 
Improve partial message support in logger
 2018-04-12 17:38:27 -07:00
Anusha Ragunathan
0b4b0a7b5d 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>
 2018-04-11 13:26:28 -07:00
Sebastiaan van Stijn
045206a45c
Merge pull request #36724 from dnephin/api-docs-add-build-target 
Add target field to build API docs
 2018-04-02 22:35:00 -07:00
Brian Goff
9d46c4c138 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>
 2018-03-29 15:49:15 -04:00
Daniel Nephin
95ccb55fe2 Add target field to build API docs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-28 14:34:58 -04:00
Daniel Nephin
6be0f70983 Automated migration using 
gty-migrate-from-testify --ignore-build-tags

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-16 11:03:43 -04:00
Emil Davtyan
117cd7ff64 Content encoding negotiation added to archive request. 
Signed-off-by: Emil Davtyan <emil2k@gmail.com>
 2018-02-24 06:41:45 +01:00
Sebastiaan van Stijn
a3efeaad52
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>
 2018-02-21 15:23:00 +01:00
Sebastiaan van Stijn
453f2b8b40
Bump default API version to 1.37 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-21 15:22:40 +01:00
Sebastiaan van Stijn
0076343b29
Merge pull request #33702 from aaronlehmann/templated-secrets-and-configs 
Templated secrets and configs
 2018-02-21 13:39:10 +01:00
Akihiro Suda
8e435b8279 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>
 2018-02-20 11:15:36 +09:00
Brian Goff
a407761e48 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>
 2018-02-16 11:25:14 -05:00
Brian Goff
8e8f5f4457 Always mount configs with tmpfs 
This makes configs and secrets behavior identical.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-02-16 11:25:14 -05:00
Aaron Lehmann
c5df7235f6 api: Add Templating parameter to SecretSpec and ConfigSpec 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2018-02-16 11:25:13 -05:00
Daniel Nephin
e574c5ae73 Move commit to container backend 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-14 16:06:12 -05:00
John Stephens
04cb98e6b5
Merge pull request #36269 from Microsoft/jjh/remove-lcow-api-platform-if-omitted 
Remove interim env var LCOW_API_PLATFORM_IF_OMITTED
 2018-02-13 15:12:18 -08:00
Brian Goff
060893ab5d
Merge pull request #36271 from dnephin/use-tag-image-in-commit 
Use TagImage in Commit
 2018-02-13 16:40:17 -05:00
Yong Tang
9cbe066e27
Merge pull request #36246 from sirreal/fix/swagger-buildargs-type 
Fix string type for buildargs API definition
 2018-02-12 11:21:42 -08:00
Jon Surrell
344c73ac67
Add example buildargs usage 
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
 2018-02-12 14:09:37 +01:00
Jon Surrell
de2b2b5e4b
Reformat to multi-line 
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
 2018-02-12 14:09:31 +01:00
Daniel Nephin
afb3eda697 Use TagImage in Commit 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-09 20:53:39 -05:00
John Howard
c111fec758 Remove interim env var LCOW_API_PLATFORM_IF_OMITTED 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2018-02-09 12:05:07 -08:00
Akihiro Suda
9769ef333f
Merge pull request #36224 from dnephin/refactor-commit 
Refactor Daemon.Commit()
 2018-02-08 21:02:30 +09:00
Jon Surrell
f281358ba2
Fix string type for buildargs API definition 
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
 2018-02-08 13:00:24 +01:00
Daniel Nephin
daff039049 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>
 2018-02-07 15:09:06 -05:00
Daniel Nephin
4f0d95fa6e Add canonical import comment 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-05 16:51:57 -05:00
Yong Tang
3a6f8cfd51
Merge pull request #36146 from yongtang/36142-TaskState 
Add `REMOVE` and `ORPHANED` to TaskState
 2018-02-02 11:33:25 -08:00
Yong Tang
9247e09944 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>
 2018-01-31 15:35:19 +00:00
Yong Tang
a40687f5ac 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>
 2018-01-30 16:46:05 +00:00
Sebastiaan van Stijn
40a9d5d24c
Merge pull request #35946 from joelwurtz/patch-2 
Fix Volumes property definition in ContainerConfig
 2018-01-29 20:57:09 -08:00
Yong Tang
958200970f
Merge pull request #36074 from shutefan/master 
Update API docs to show that /containers/{id}/kill returns HTTP 409
 2018-01-28 08:32:35 -08:00
Yong Tang
093a5402a0
Merge pull request #34655 from nmeyerhans/document-init-api 
Add Init API field documentation to swagger
 2018-01-25 10:16:27 -08:00
Sebastiaan van Stijn
2b2265acbb
Merge pull request #35989 from dani-docker/orca-11380 
verbose info is missing for partial overlay ID
 2018-01-24 16:01:31 -08:00
Noah Meyerhans
467ea71e5e
Add Init API field documentation to swagger 
Signed-off-by: Noah Meyerhans <nmeyerha@amazon.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-01-24 09:46:12 -08:00
Yong Tang
d63a5a1ff5 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>
 2018-01-23 01:04:33 +00:00
Dani Louca
2e0990f165 fix verbose for partial overlay ID 
Signed-off-by: Dani Louca <dani.louca@docker.com>
 2018-01-22 18:50:49 -05:00
Vincent Demeester
fbed4eb8c7
Merge pull request #36013 from thaJeztah/improve-version-middleware-test 
Improve API version-middleware test
 2018-01-22 14:59:06 -08:00