Commit Graph

1541 Commits

Author SHA1 Message Date
5ec30c4d85 Merge pull request #18835 from dnephin/move_validate_context_dir
Move utils.ValidateContextDirectory to the one package that uses it
Upstream-commit: 6cd167386b0133600ea5bbcd0f93d464e6f89e0c
Component: engine
2015-12-28 22:06:13 +01:00
3849375325 Merge pull request #18715 from calavera/remove_is_paused_from_interface
Remove `IsPaused` from backend interface.
Upstream-commit: baee7ae045019d33e6833043bbf86bd76e1b9d41
Component: engine
2015-12-28 11:25:11 -08:00
3ae3fdb79c Merge pull request #15078 from hqhq/hq_add_set_api_v2
Implement docker update command
Upstream-commit: 8669ea01ba93139a51783ac17658dedd47538b9c
Component: engine
2015-12-28 08:55:32 -08:00
73f5d740e8 Move ValidateContextDirectory to the one package that uses it.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9e19b4839fe32d2935306a630305e7b821544c14
Component: engine
2015-12-28 11:22:39 -05:00
c4af30652d Implemet docker update command
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79
Component: engine
2015-12-28 19:19:26 +08:00
9b042e6617 Remove duplicated OomKilldisable
It's in Resources, but wrongly added back to HostConfig in
https://github.com/docker/docker/pull/18762

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 2e02077e9f9608e1f5aa462be2bb88655763a113
Component: engine
2015-12-24 15:28:56 +08:00
a2f37707c9 Merge pull request #18878 from calavera/conditional_load_response
Make `docker load` to output json when the response content type is json.
Upstream-commit: b0be88c1116d4a3e12df42fb903456f608a19756
Component: engine
2015-12-24 01:11:54 +01:00
1cfbdcfe91 Remove package pkg/ulimit, use go-units instead.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 83237aab2b9430a88790467867505cc9a5147f3e
Component: engine
2015-12-23 13:27:58 -05:00
b109cc7bb5 Move ulimit options to runconfig opts
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5adbea7075b2fda6ea9947d131aaa2a5db0c1295
Component: engine
2015-12-23 13:27:58 -05:00
6f10e6b229 Add filter for network ls to hide predefined net
Add filter support for `network ls` to hide predefined network,
then user can use "docker network rm `docker network ls -f type=custom`"
to delete a bundle of userdefined networks.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 26dd026bd70c9c18a16b0e339821c309e56d8ff0
Component: engine
2015-12-23 13:26:40 +08:00
382aba32a8 Make docker load to output json when the response content type is json.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9fd2c0feb0c131d01d727d50baa7183b976c7bdc
Component: engine
2015-12-22 19:00:27 -05:00
027f002cb3 Move Config and HostConfig from runconfig to types/container.
- Make the API client library completely standalone.
- Move windows partition isolation detection to the client, so the
  driver doesn't use external types.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7ac4232e70fe7cf7318333cd0890db7f95663079
Component: engine
2015-12-22 13:34:30 -05:00
2ecbc5b7f6 Remove usage of runconfig.ConvertKVStringsToMap in the API client library.
It's a very simple function that we can duplicate.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 747dccde41762f10d0afcdd9b243fb1ea85cbd9f
Component: engine
2015-12-22 13:31:46 -05:00
f1f019f89d Move ExecConfig to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 839f73c3028629ac1dde6617d6466b98f2bde416
Component: engine
2015-12-22 13:31:46 -05:00
b006691148 Replace usage of pkg/nat with go-connections/nat.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 056e7449039af522fa0a1567ef67916eaa0de93e
Component: engine
2015-12-22 13:31:46 -05:00
3b25d376dd Move blkiodev package to types.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0aab83d996f645a2e1e28b1e2c03b530c13a5fc1
Component: engine
2015-12-22 13:31:46 -05:00
7e8fcbf740 Move StrSlice to types.
This is a very docker concept that nobody elses need.
We only maintain it to keep the API backwards compatible.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f9b857a200696b07b67e6a7f94ede32487f5649d
Component: engine
2015-12-22 13:31:43 -05:00
8ec62ec94b Merge pull request #18830 from calavera/tls_verify_godoc
Add godoc comment about client tls verification.
Upstream-commit: 1a8e8f2967c8f17072d4f2b43ad0c69dd6952ac8
Component: engine
2015-12-21 10:02:32 -08:00
306ef7b263 Merge pull request #17692 from vdemeester/images-format
Add --format support to images command
Upstream-commit: 42460b6772323552bfb58ae703124145ffd8a56b
Component: engine
2015-12-21 09:57:29 -08:00
141f74a2b0 Add godoc comment about client tls verification.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 4e2c0f385c3032b0b15105c81b18e3981e6e40ad
Component: engine
2015-12-21 12:55:37 -05:00
9e1ab087f5 Remove IsPaused from backend interface.
Move connection hijacking logic to the daemon.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: af94f941df9ee43b61e0e8f9d3c3b3962597eff6
Component: engine
2015-12-21 12:34:21 -05:00
f41d29a49b Add --format support to images command
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 34a3c3cacf2fd827f13a5e37541acff1409658c4
Component: engine
2015-12-21 17:38:07 +01:00
1c5df6581b Change the quiet flag behavior in the build command
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.

However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.

This patch makes the quiet flag behave in the following way:
 1. If the build process succeeds, stdout contains the image ID
    and stderr is empty.
 2. If the build process fails, stdout is empty and stderr
    has the error message and the diagnostic output of that process.

If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 60b4db7eb17f4eb509be4a4968364ada2075d60c
Component: engine
2015-12-21 16:38:50 +02:00
3dcfd49f35 Fix the api/client/ps unit tests.
TestFormat was depending on the time so (comparing again
1970-01-01).. at some point it was bounded to fail >_<. Updating it to
be *not* time-dependent :).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bb853137bea8481037b88d16eeb6499b8ed63a81
Component: engine
2015-12-21 11:07:14 +01:00
fdba0e61b5 Merge pull request #18779 from aditirajagopal/18750-new-string-method
pkg/version.Version: use the new String() method
Upstream-commit: 7ff61dd592335c7b3673b41153d9cf8995e468a3
Component: engine
2015-12-18 21:21:17 -05:00
ce07d20209 Merge pull request #18763 from calavera/fix_raw_inspect
Print the raw inspected elements when there is no template for `docker inspect`.
Upstream-commit: 58ebc71272d3facec798664366cc169aa8df8449
Component: engine
2015-12-18 15:25:38 -08:00
76f3bf50c1 pkg/version.Version: use the new String() method
Resolves #18750

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 278e75800c7be10ca43ffb11de25cd342da106fe
Component: engine
2015-12-18 15:29:32 -05:00
cc50cf65a0 Merge pull request #18761 from anusha-ragunathan/add-build-routes
Create build router separate from image router.
Upstream-commit: 92605b823d4facbe9076b58dd0b0d77101529ad9
Component: engine
2015-12-18 21:09:43 +01:00
d5f830baed Merge pull request #18771 from runcom/authz-fixes-1
authZ: more fixes
Upstream-commit: b714e03fddc71b0d1af7a27198ae5a342b8ce39f
Component: engine
2015-12-18 17:58:02 +01:00
3a6aede7f5 Merge pull request #18721 from tiborvass/remove-dependencies-from-builder
Remove image and daemon dependencies from builder
Upstream-commit: 64d70de0a2aa29f565336e896b76c23c879a9a98
Component: engine
2015-12-18 17:19:55 +01:00
760531cbbc Merge pull request #18730 from calavera/remove_sockets_dependency
Remove api client lib dependency on tlsconfig and sockets packages.
Upstream-commit: b708a2249bfa7d9a7bff74b28264fd40ca4e6d1e
Component: engine
2015-12-18 10:35:51 -05:00
d63981ab4d authZ: more fixes
- fix naming and formatting
- provide more context when erroring auth
- do not capitalize errors
- fix wrong documentation
- remove ugly remoteError{}

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5a64c8027ecd2bebe773c9abd2e73c2fd7d23de1
Component: engine
2015-12-18 16:29:01 +01:00
871c2bc240 Merge pull request #18741 from WeiZhang555/debug-info
Better debug message for post form data
Upstream-commit: 47060efdb763305ed7c406ac3a62062d9f51ef21
Component: engine
2015-12-18 16:06:07 +01:00
50b12bd7e1 Print the raw inspected elements when there is no template for docker inspect.
Otherwise we're ignoring the fields that Swarm adds to the output.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1f5674363e4dd81c9ecd52ef3e1f252c76784697
Component: engine
2015-12-17 23:17:52 -05:00
71b76682f6 Create build router separate from image router.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: f8dc044aecd6fa00c33dc6a72321a3e249a0b40d
Component: engine
2015-12-17 16:56:11 -08:00
da94425c54 Remove api client lib dependency on tlsconfig and sockets packages.
- Let consumers to configure the http transport initially and apply or
  defaults on top.
- Add function to initialize a new client based on environment
  variables, useful for integrators.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: defd1519f77ef0caaab2cfeeb6433c8a24c62ffc
Component: engine
2015-12-17 19:04:49 -05:00
49f762b669 builder: remove daemon dependency in ContainerCreate()
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 03a170c48d660be72c387f1821ca48a713dd1cea
Component: engine
2015-12-17 16:57:08 +01:00
9a50c6c5f4 Merge pull request #18559 from ahmetalpbalkan/return-container-networks
Proposal: Add container networks list to /containers/json
Upstream-commit: 0f749ad55ab794872e601b4f665b07c0be07abfc
Component: engine
2015-12-17 10:11:18 +01:00
0f33f3e178 Better debug message for post form data
Print json format instead of default `%q`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: aaf65a47a7a6d9e45b77815ea252a302eefe1096
Component: engine
2015-12-17 15:55:39 +08:00
7c30c7ccac Merge pull request #15964 from duglin/APIVersion
Add a DOCKER_API_VERSION env var
Upstream-commit: 905f3336b2715b3960b5ff4f860db387797d9adf
Component: engine
2015-12-16 14:23:47 -08:00
31f577ea49 Clean up reference type switches
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: eeb2d4c1adbe4e00f9fbcdc70f9ac31997968e1d
Component: engine
2015-12-16 11:58:53 -08:00
84a459522b Remove unused repoinfo
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c1040b222c2520f8a0ebe14e81b5b7fe188e8dc6
Component: engine
2015-12-16 11:58:52 -08:00
9b8bb0d4e1 Update Named reference with validation of conversions
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ffded61dad76e4c6530359d879afe83907e409a7
Component: engine
2015-12-16 11:58:52 -08:00
020b74d545 Add own reference package wrapper
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2655954c2dd9d92c2394b04e4262543174c4c038
Component: engine
2015-12-16 11:58:52 -08:00
4738f86f62 Merge pull request #18682 from calavera/replace_units_package
Replace pkg/units with docker/go-units.
Upstream-commit: b44b5bbc8ba48f50343602a21e7d44c017c1e23d
Component: engine
2015-12-16 10:48:59 -08:00
3d517a11e5 Replace pkg/units with docker/go-units.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 4fef42ba206ac90346e6e0fe25bead3f77dc4b0f
Component: engine
2015-12-16 12:26:49 -05:00
900008a6f2 api: client: lib: fix go vet
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 38f409d283c9ec328f25a3646bf6605beb897e0d
Component: engine
2015-12-16 12:00:48 +01:00
b1147e3d7d Move filters package to the API.
These filters are only use to interchange data between clients and daemons.
They don't belong to the parsers package.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: e98cae4919da69dc6f9ae46527792cf2012cc7f2
Component: engine
2015-12-15 18:13:26 -05:00
7cc80752fd Merge pull request #18685 from calavera/remove_timeutils
Move timeutils functions to the only places where they are used.
Upstream-commit: 52fd30079a8f9a56402d4c4f1666c96bd9af98da
Component: engine
2015-12-15 15:11:18 -08:00
bb4c66ef5c Merge pull request #18676 from dnephin/more_registry_types_to_api
Move registry.SearchResult types to api/types/registry
Upstream-commit: 7bb30e0aeb19b5d724a68eefacf0495abd7a874f
Component: engine
2015-12-15 12:00:24 -08:00