Commit Graph

1503 Commits

Author SHA1 Message Date
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
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
7f43cd332d Move timeutils functions to the only places where they are used.
- Move time json marshaling to the jsonlog package: this is a docker
  internal hack that we should not promote as a library.
- Move Timestamp encoding/decoding functions to the API types: This is
  only used there. It could be a standalone library but I don't this
it's worth having a separated repo for this. It could introduce more
complexity than it solves.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 27220ecc6b1eedf650ca9cf94965cb0dc2054efd
Component: engine
2015-12-15 14:56:14 -05:00
ff4354d4e6 Merge pull request #18617 from tiborvass/cleanup-builder
Cleanup builder: remove container package dependency
Upstream-commit: 2180dd6cf0258dee45a11ce6bf597448b8157984
Component: engine
2015-12-15 09:59:29 -08:00
2a2006ef18 Merge pull request #17034 from rhvgoyal/volume-propagation
Capability to specify per volume mount propagation mode
Upstream-commit: ce0b1841c82b6972d96654e083f813944e72443f
Component: engine
2015-12-15 12:14:41 -05:00
eb815212b6 Merge pull request #18416 from toli/disable-official-repo-check-in-push
Removing the restriction to push to an 'official' repo
Upstream-commit: adf1ffd53b070443fd0f544c568e6c53d373caeb
Component: engine
2015-12-15 08:52:36 -08:00
c85ff1af0e Move registry.SearchResult types to api/types/registry.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c4472b389dae8e86c8d98872fcbfe0c63d1e15a1
Component: engine
2015-12-15 11:44:20 -05:00
637e991bae dockerfile: get rid of Commit and CommitConfig
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 400e4922cbd004b93774fc55005f74bd8a995242)
Upstream-commit: 2a2d1f57b586632a5304f1093add28ef64661902
Component: engine
2015-12-15 17:23:40 +01:00
9d8787d53c Merge pull request #18536 from WeiZhang555/daemon-err
Better error message for invalid unix socket format
Upstream-commit: 98d97743d2ef40156a28f82381d60a0635a1aff8
Component: engine
2015-12-15 11:51:47 +01:00
1902774c3d Merge pull request #18650 from calavera/remove_httputils_dep_from_api
Remove httputils dependency from API client lib.
Upstream-commit: 2ec34dca050f839480e6b2f0c8b892e0a73a0d16
Component: engine
2015-12-14 20:51:53 -08:00
b07ebd0f2f Add containers’ networks to /containers/json
After addition of multi-host networking in Docker 1.9, Docker Remote
API is still returning only the network specified during creation
of the container in the “List Containers” (`/containers/json`) endpoint:

    ...
    "HostConfig": {
      "NetworkMode": "default"
    },

The list of networks containers are attached to is only available at
Get Container (`/containers/<id>/json`) endpoint.
This does not allow applications utilizing multi-host networking to
be built on top of Docker Remote API.

Therefore I added a simple `"NetworkSettings"` section to the
`/containers/json` endpoint. This is not identical to the NetworkSettings
returned in Get Container (`/containers/<id>/json`) endpoint. It only
contains a single field `"Networks"`, which is essentially the same
value shown in inspect output of a container.

This change adds the following section to the `/containers/json`:

    "NetworkSettings": {
      "Networks": {
        "bridge": {
          "EndpointID": "2cdc4edb1ded3631c81f57966563e...",
          "Gateway": "172.17.0.1",
          "IPAddress": "172.17.0.2",
          "IPPrefixLen": 16,
          "IPv6Gateway": "",
          "GlobalIPv6Address": "",
          "GlobalIPv6PrefixLen": 0,
          "MacAddress": "02:42:ac:11:00:02"
        }
      }
    }

This is of type `SummaryNetworkSettings` type, a minimal version of
`api/types#NetworkSettings`.

Actually all I need is the network name and the IPAddress fields. If folks
find this addition too big, I can create a `SummaryEndpointSettings` field
as well, containing just the IPAddress field.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 755f8609f699a20cb47ec7269e3a9469541a9419
Component: engine
2015-12-14 19:03:23 -08:00
ed5505c1c9 Better error message for invalid unix socket format
Give more meaningful error prompts when user try to bind a directory as
unix socket.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 20012e423c865d12889af89f41459d30e7fe7901
Component: engine
2015-12-15 10:05:58 +08:00
1bf96a8c15 Merge pull request #18644 from calavera/remove_timeout_func_dependency_from_api_lib
Remove timeout shared function.
Upstream-commit: 87740d001c5888834496f1612ae80aa95306ff5f
Component: engine
2015-12-14 23:05:29 +01:00
e47f560066 Remove httputils dependency from API client lib.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 83b5729f6452de6b40719b9485947eea0bd0eedd
Component: engine
2015-12-14 16:48:59 -05:00
6a842265ad Add a DOCKER_API_VERSION env var
Closes: #11486

Just for @ahmetalpbalkan  :-)

Fixed some comment formatting too while in there.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6287ec9095f380449f0b4f1a06d4e5df43fc4449
Component: engine
2015-12-14 12:45:34 -08:00
6e0f72dc84 Merge pull request #18637 from dnephin/move_auth_config
Move more api types to api/types package
Upstream-commit: 75d69ce0da2e360773736502acd92d4a9cf7faa5
Component: engine
2015-12-14 11:53:30 -08:00
7e7a8a6ffd Remove timeout shared function.
Handle timeouts when it's necessary based on a Timeout interface.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9dc7d07fc11163205985b7d56742a4f9b89d7e09
Component: engine
2015-12-14 14:24:21 -05:00
a55d187756 Force API versioning in the client library.
Remove dependencies on docker's version packages.
Allow empty version as a fallback to latest version.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b679eb9a8263d2cb00fecc8741d62d2b35db5ac5
Component: engine
2015-12-14 12:06:42 -05:00
7f5dff04d0 Move IndexInfo and ServiceConfig types to api/types/registry/registry.go
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 96c10098ac32f700f37358e2adc36c94741772bb
Component: engine
2015-12-14 11:28:02 -05:00
f21c49a3d1 Merge pull request #18631 from tiborvass/cleanup-utils
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
Upstream-commit: 44299989b24507dad0bcd66fefcbc2a00e13665c
Component: engine
2015-12-14 17:22:01 +01:00
0d867da41c Move AuthConfig to api/types
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 5b321e328769cc93c3454e82ec3fe07672156f2e
Component: engine
2015-12-14 11:22:01 -05:00
c91a6d546b Removing the restriction to push to a 'official' repo
Signed-off-by: toli <toli@docker.com>
Upstream-commit: 0d824c760ec2413f4df7855b9b6559424d01e556
Component: engine
2015-12-14 07:45:00 -08:00
c0860c6bed Add capability to specify mount propagation per volume
Allow passing mount propagation option shared, slave, or private as volume
property.

For example.
docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: a2dc4f79f260247afe55ab7117c9de02a769d883
Component: engine
2015-12-14 10:39:53 -05:00
07745f2aef Merge pull request #18618 from dnephin/refactor_resolve_auth_config
Refactor ResolveAuthConfig to remove the builder dependency on cli code
Upstream-commit: 5e0283effa73223e5528c61beb4e05b5018c5d6b
Component: engine
2015-12-14 15:23:36 +01:00
1caa5bd099 utils: move dockerignore function to builder/dockerignore
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 63e3816c1dd449de63500a2b5fec9c2a33a0894c
Component: engine
2015-12-14 14:59:52 +01:00
86409751de utils: move git functions to pkg/gitutils
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 135cca6f52c7862f13f50c30ccf5925038ba40a9
Component: engine
2015-12-14 14:59:52 +01:00
99a16e1ac6 Merge pull request #18616 from calavera/move_client_version_to_docker_cli
Move client version to the docker cli.
Upstream-commit: 5fd9a8f6030558d90f4e1a3e55f6b0017d34d23f
Component: engine
2015-12-14 11:43:01 +01:00
3c4fcf6b7a Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
1d681e5873 Merge pull request #15365 from twistlock/14674-docker-authz
Docker authorization plug-in infrastructure
Upstream-commit: 1fffc0270ffb56d99a8440a10a0effdb3acd934d
Component: engine
2015-12-12 12:30:33 +01:00
5ff0f9ef5e Refactor ResolveAuthConfig to remove the builder dependency on cli code.
registry.ResolveAuthConfig() only needs the AuthConfigs from the ConfigFile, so
this change passed just the AuthConfigs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 920ea13516c24d00931cac42b608b5827986ede7
Component: engine
2015-12-11 19:31:24 -08:00
c5bbeb25cd Move client version to the docker cli.
This removes the dockerversion dependency from the client library.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 229d3bace8fbf1c077c063047710a6857ee2aaa6
Component: engine
2015-12-11 19:03:33 -05:00
0d0535be72 Merge pull request #18610 from runcom/fix-warn
api: client: info: add newline after warning
Upstream-commit: 91799c232e5f4e2f5dbfd78e0520a97eb2d826c0
Component: engine
2015-12-11 13:41:14 -08:00
85dc531227 api: client: info: add newline after warning
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: bb3d7e1e6543a49fd344e765169265a08a19331a
Component: engine
2015-12-11 20:54:51 +01:00
34ad96c328 Make sure template inspector always prints a carriage return.
To match with the raw inspector.
Adds tests to verify its functionality.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bc02d42d9ec6d6741946e2edbd13ff8a78bbdb80
Component: engine
2015-12-10 21:13:13 -05:00
0da90605c7 Merge pull request #18564 from runcom/warn-on-loopback
api: client: info: print a warning if dm is using a loopback file
Upstream-commit: a16a1d75d928000c8e8e9995d8843a685aa5df65
Component: engine
2015-12-11 10:11:03 +10:00
9847131043 Merge pull request #18353 from aaronlehmann/transfer-manager
Improved push and pull with upload manager and download manager
Upstream-commit: ac453a310bac6bdd7cd9d780a63d4168064570d1
Component: engine
2015-12-10 14:52:48 -08:00
3ca5c467e0 Merge pull request #18557 from cpuguy83/use_correct_resize_fn
Use correct fn for resizing TTY
Upstream-commit: a0f80079b8e699b992f34cc76a97ba578421fdbb
Component: engine
2015-12-10 12:37:13 -08:00
e467805405 api: client: info: print a warning if dm is using a loopback file
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a2c4c0cd3a2e5b58b36718290cb7c31f99f6495e
Component: engine
2015-12-10 14:05:28 +01:00
b7df006fa3 Merge pull request #18562 from haoshuwei/modify-wordspelling-in-docker-stats
Modify word spelling  in stats.go's comments
Upstream-commit: 3d82564c7a6ae139879b869a987bf9274ed0275d
Component: engine
2015-12-10 13:32:10 +01:00
175c786e42 Merge pull request #18553 from calavera/remove_specific_go_1_5_calls
Remove call to template.Option when building with 1.4.
Upstream-commit: d46650b3c7700cd6828f57409e981d8312c3fd32
Component: engine
2015-12-10 09:28:00 +01:00