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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
5017f2840c
Merge pull request #35593 from ndeloof/master
...
Improve swagger schema for code generation
Upstream-commit: 16a1736b9b93e44c898f95d670bbaf20a558103d
Component: engine
2018-01-08 12:17:56 +01:00
27f91f80b9
introduce « exec_die » event
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: aa6bb5cb698ebcf6662e6667bc58055b5b5bde23
Component: engine
2018-01-08 11:42:25 +01:00
65164d88f6
Fix Volumes property definition in ContainerConfig
...
Actually the specification was expecting a 'additionalProperties' for the Volumes data, where in fact it's expecting
a map of string pointing to empty object.
Signed-off-by: Joel Wurtz <joel.wurtz@gmail.com >
Upstream-commit: dc883c0486b398eb5ad99f35aef3ff02a5a7dd29
Component: engine
2018-01-06 16:12:05 +01:00
756e315027
fix attribute names on ProgressDetail
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 5e63edfa935e4f87e588d358d7060227745de288
Component: engine
2017-12-16 09:38:34 +01:00
264a31ea91
CreateImage uses ‘id’ to track layers
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: cfa07bffb5e27763fa4bb189133dadd179e4bd23
Component: engine
2017-12-16 09:38:34 +01:00
7b36860dee
BuildInfo uses ‘aux’ to document image ID after build
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 9e29d2ea49aaee9cd92fa3fe026ff5f8ab1f8a25
Component: engine
2017-12-16 09:38:33 +01:00
0834563329
use swagger support for « title » as generated types names for inline schema
...
align naming convention with x-go-name
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 8e7f9afa471c2be079f2c8897cf3b87e7f60544e
Component: engine
2017-12-13 18:54:37 +01:00
17ee87b9ed
Bump API version to 1.36
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c1e982f2ee85580687e2d355af3ca444ada14d01
Component: engine
2017-12-07 13:52:49 -08:00
96784302eb
Merge pull request #35705 from tiborvass/platform-version
...
api: generalize version information to any platform component
Upstream-commit: a1be987ea9e03e5ebdb1b415a7acdd8d6f0aaa08
Component: engine
2017-12-06 16:43:38 -08:00
947ed56f66
Adjust swagger definitions
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 87ebfa11f66d2109054ad3024217a5101b45aa8c
Component: engine
2017-12-06 23:23:55 +01:00
7661258841
Merge pull request #35721 from dnephin/fix-swagger-spec-errors
...
Fix codegen problems in swagger spec
Upstream-commit: 7f4cf43637067d27a1035d4ff412710ead82bbab
Component: engine
2017-12-06 13:36:52 -08:00
02ebcae82d
Merge pull request #35146 from masaeedu/27919-removemultitypes
...
Change multi-type parameters to single type
Upstream-commit: 7db57f7fcac33583403d1d4ccf52b1c27f7e0ad1
Component: engine
2017-12-06 16:22:17 -05:00
3ef7b79d93
Fix codegen problems in swagger spec
...
Code generation does't support multiple types
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3648d883556e59392e3e5a05ef5de1b56b68c6fc
Component: engine
2017-12-06 13:38:45 -05:00
41a5926818
Merge pull request #35661 from ndeloof/8917
...
introduce `workingdir` option for docker exec
Upstream-commit: 5e5fadb3c0201553929d4a6ea8dc8f9d8a1e56fe
Component: engine
2017-12-06 12:40:25 +01:00
5016fee3dc
Merge pull request #35578 from thaJeztah/fix-portbindings-swagger
...
Fix PortBindings definition in Swagger
Upstream-commit: ac68411f85a1c4540c0d4f5b7db86b0b0422f025
Component: engine
2017-12-01 17:46:38 -05:00
148bfd3114
introduce workingdir option for docker exec
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 19f2749d3906707717aeec9da27c499bcdc07da8
Component: engine
2017-12-01 09:06:07 +01:00
01d480da3c
duplicate definitions for API response with just an ID
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: d6935a8f1a4003c0b6f1b89a0e28e721d0756ac9
Component: engine
2017-11-24 11:41:04 +01:00
749a92c1a6
schema is missing CanRemove & DetachKeys
...
example demonstrates they are expected
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 74cb739766e517115c5af9cee2202613661238a0
Component: engine
2017-11-24 11:40:12 +01:00
12aa8ed3d8
memory is an int64 (long)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 5ad85b1d4d69806754d1814f019b03b57e40d6da
Component: engine
2017-11-23 14:24:43 +01:00
3ceb534c1b
Fix PortBindings definition in Swagger
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a50cf8aa44f2a5abb5900d39008d075d2e8c2850
Component: engine
2017-11-22 17:55:37 +01:00
be9497fbf4
Fix consumes MIME type for NetworkConnect
...
This route expects `application/json`. Sending a content type header of `application/octet-stream` results in an error.
Signed-off-by: Asad Saeeduddin <masaeedu@gmail.com >
Upstream-commit: 876b32861789a0424557c640622bde47eedd2d98
Component: engine
2017-11-18 22:34:23 -05:00
e52bfcca39
fixed special character
...
`scope`=<string> local or swarm had special character, which was breaking the Swagger UI
Signed-off-by: Jeeva S. Chelladhurai <sjeeva@gmail.com >
Upstream-commit: a21654c34b741656582b09e09127821311909dcd
Component: engine
2017-11-08 19:17:24 +00:00
5de35938b7
Merge pull request #32914 from jamiehannaford/until-logging
...
Add --until flag for docker logs; closes #32807
Upstream-commit: 68a4552529c2eafb7093dc2bc25e7fc243bf363f
Component: engine
2017-11-03 16:08:30 +01:00
bd820b2e31
Remove Docker/API version matrix
...
The Swagger file contained a version matrix to
find which API version is used by which version
of Docker.
Given that Docker is a downstream of the Moby project,
we should not be maintaining such a matrix in this
repository.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3fb228ba50ccb921148e0174e5e5e45ab650c3e5
Component: engine
2017-11-01 22:29:26 +01:00
45def429d3
Merge pull request #34424 from simonferquel/swarm-service-isolation
...
Added support for swarm service isolation mode
Upstream-commit: d91c5f42eb37c6f88cec4021c10c0a1ded1785c3
Component: engine
2017-11-01 16:41:10 -04:00
fb29de3583
Add --until flag for docker logs; closes #32807
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: e8d9a61f4c9e1f3cfdf1c889c541c9dc72a4bb40
Component: engine
2017-11-01 10:08:49 +01:00
9e1b28e972
Merge pull request #35343 from thaJeztah/bump-api-version-1.35
...
Bump API version to 1.35
Upstream-commit: 3ba1dda1914fa7d380d9d3220c3b158a41f90cba
Component: engine
2017-10-31 12:37:12 -07:00
6b11145c27
Bump API version to 1.35
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ba6b5aa7f28dbc76c6e0c494eb228a652a0d55a7
Component: engine
2017-10-31 12:57:14 +01:00
2700d23ec3
Merge pull request #35102 from ripcurld0/doc_31926
...
Elaborate more about port allocation in docs
Upstream-commit: a6f09a7509cd77b4ce0bf26845a253a7d9997d11
Component: engine
2017-10-30 20:28:36 +01:00
1377e81acb
Added support for swarm service isolation mode
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: f28cb422e69bd4239401e6ea32b65b56485d6691
Component: engine
2017-10-30 16:16:18 +01:00