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

1794 commits

Author SHA1 Message Date
Robin Naundorf
737219bbdb Fixing help text of "docker network --help" to be consistend 
Changed from hashmap to multidimensional array as in "docker volume --help"
closes #21710

Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
 2016-04-01 14:14:09 +02:00
Sebastiaan van Stijn
4a7bd7eaef Merge pull request #20410 from tkopczynski/20236-info-insecure-registry 
Add insecure registries to docker info
 2016-03-31 16:39:25 -07:00
Tibor Vass
f19f91d0da Merge pull request #21693 from cyli/fix-trusted-build-and-run 
Request pull credentials when using trusted reference
 2016-03-31 16:35:06 -04:00
cyli
df9cc3d922 Request pull credentials when using trusted reference 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-03-31 10:56:19 -07:00
Tonis Tiigi
b38cee9f9c Fix race between with event timer stopping early 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-31 09:49:07 -07:00
Tomasz Kopczynski
44a50abe7b Add insecure registries to docker info 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-03-31 08:27:24 +02:00
David Calavera
d12b7c7e3e Remove builder dependency from the api. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-29 17:02:36 -07:00
Arnaud Porterie
1da40fb4ba Merge pull request #21586 from calavera/remove_runconfig_from_routes 
Remove runconfig package dependency from the API.
 2016-03-29 08:40:49 -07:00
David Calavera
f0d26e1665 Remove runconfig package dependency from image and container routers. 
Use an interface to specify the behavior of a configuration decoder.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-28 16:23:51 -04:00
David Calavera
3ca29823d4 Remove runconfig dependency from network routes. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-28 16:23:50 -04:00
David Calavera
be390c30cd Merge pull request #21523 from LK4D4/cancellable_routes 
Embed context.Context to routes with usage of CloseNotify
 2016-03-28 12:44:07 -07:00
David Calavera
dd7691423f Merge pull request #21566 from allencloud/upper-case-docker-info-display 
upper case docker info details
 2016-03-28 11:37:23 -07:00
allencloud
276a20dd42 upper case docker info details 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-03-28 18:47:04 +08:00
Alexander Morozov
c6ad1980a2 use router.Cancellable for pull and push 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-27 21:53:25 -07:00
Liron Levin
3c157713b3 Extend Docker authorization with TLS user information 
Currently Docker authorization framework does not use any user
information, which already available in the Docker context for TLS
connection.
The purpose of this CR is to complete the existing authz work by adding
the basic client certificate details (SUBJECT_NAME) and authentication
method (TLS) to the authz request.

We think this should be the default behavior when no extended
authorization module is specified (currently WIP under #20883).

Signed-off-by: Liron Levin <liron@twistlock.com>
 2016-03-27 15:53:55 +03:00
David Calavera
0524a9783d Merge pull request #21508 from vdemeester/remove-client-unused-method 
Removing DockerCli.pullImage as it's never used
 2016-03-25 13:52:49 -07:00
Alexander Morozov
62c9e62edc use router.Cancellable instead of direct CloseNotify 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-25 11:33:54 -07:00
Tõnis Tiigi
e2221d1f37 Merge pull request #21468 from coolljt0725/remove_useless_log 
Do not return error on hijacked connection for docker exec
 2016-03-25 10:50:43 -07:00
Alexander Morozov
bdd9388c42 api/server/router: add Cancellable function 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-25 10:19:23 -07:00
Vincent Demeester
8f4b7a3361 Removing DockerCli.pullImage as it's never used 
This function is never used nor exported. It has been superseeded by
pullImageCustomOut.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-03-25 17:41:19 +01:00
Alexander Morozov
f2401a0f69 builder: replace cancelled channel with net/context 
Also stop execution of run immediately if request was cancelled.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-25 08:19:29 -07:00
Alexander Morozov
641bd7652f Merge pull request #20589 from coolljt0725/fix_restore_terminal 
cli: move setRawTerminal and restoreTerminal to holdHijackedConnection
 2016-03-24 22:42:24 -07:00
Lei Jitang
66d3dcc6f7 cli: move setRawTerminal and restoreTerminal to holdHijackedConnection 
In this way, we can restore the Terminal as soon as possible once the hijacked
connection end. This not only fix weird output if cli enable -D, but also
remove duplicate code.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-03-24 21:25:50 -04:00
Alexander Morozov
6748ecb005 Merge pull request #21456 from calavera/remove_unecessary_hardcoded_version 
Remove unnecessary hardcoded version.
 2016-03-24 14:31:59 -07:00
Vincent Demeester
2b6b2e1af8 Merge pull request #21464 from coolljt0725/cleanup_dot 
Cleanup: remove redundant period
 2016-03-24 18:34:20 +01:00
David Calavera
accf28a7db Remove unnecessary hardcoded version. 
The server configuration already keeps the current version
if the daemon. This patch changes the middleware logic
to use it rather than using the global value.

This removes the dockerversion package dependency from the api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-03-24 12:33:40 -04:00
Lei Jitang
d6ccc0e09f Do not return error on hijacked connection for docker exec 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-03-24 08:52:13 -04:00
Lei Jitang
cb5b8767b6 Cleanup: remove redundant period 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-03-24 08:26:04 -04:00
Sebastiaan van Stijn
5ef04b1c6d Merge pull request #21268 from calavera/remove_dockerfile_from_api 
Remove dockerfile dependency from the API.
 2016-03-23 19:34:21 -07:00
Tibor Vass
928ea1e957 Bump API Version to v1.24 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-03-23 12:26:23 -04:00
David Calavera
fb1365639e Merge pull request #21406 from LK4D4/fix_streams_race 
builder: synchronize stderr and stdout
 2016-03-22 17:15:01 -07:00
Tibor Vass
8b8fcb796f Merge pull request #21303 from riyazdf/notary-vendor-docker1.11 
vendor notary for docker1.11
 2016-03-22 17:57:17 -04:00
Alexander Morozov
3eb0a80f29 builder: synchronize stderr and stdout 
it's concurrent streams and should be synchronized before writing to response.
Otherwise there will be race in writing to *bufio.Writer in
net/http.response.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-03-22 13:57:29 -07:00
Tibor Vass
53d2e5e9d7 Merge pull request #21270 from ehazlett/resource-labels 
Add Label support for Images (build), Networks and Volumes on Creation
 2016-03-22 15:12:33 -04:00
Riyaz Faizullabhoy
ab3772f72f vendor notary for docker1.11 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-22 11:28:19 -07:00
Evan Hazlett
fc214b4408 add label support for build, networks and volumes 
build: implement --label

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

network: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

volume: allow adding labels on create

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

add tests for build, network, volume

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vendor: libnetwork and engine-api bump

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-03-22 11:49:06 -04:00
Vincent Demeester
666563b190 Merge pull request #21046 from cyli/use-notary-cli 
Sign all first-level delegation roles when doing a trusted push
 2016-03-22 07:42:21 +01:00
Aaron Lehmann
c44e7a3e63 Pass upstream client's user agent through to registry on operations beyond pulls 
This adds support for the passthrough on build, push, login, and search.

Revamp the integration test to cover these cases and make it more
robust.

Use backticks instead of quoted strings for backslash-heavy string
contstands.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-03-21 14:31:47 -07:00
Arnaud Porterie
278d3962a8 Merge pull request #21306 from mgoelzer/issue20001-nodeps 
Pass upstream client's user agent through to registry on image pulls
 2016-03-21 14:26:59 -07:00
cyli
623ccc2f31 Pull, Pull-A, and Build will only pull tags from the targets role or the targets/releases role. 
It will ignore tags in all other delegation roles.

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-03-21 10:56:49 -07:00
Riyaz Faizullabhoy
ca57f4e6a8 Add test for targets/releases preference when pulling 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-03-21 10:56:42 -07:00
cyli
497a58e6e4 Trusted push now adds the tag to every first level delegation role for which we have keys 
and for which the tag conforms to path restrictions.

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-03-21 10:56:09 -07:00
Antonio Murdaca
5008a34072 Merge pull request #21333 from cpuguy83/sigpipe 
Don't forward SIGPIPE from client to container
 2016-03-21 15:09:13 +01:00
Doug Davis
7942160638 Add the name of the exe that's trying to be executed 
so that the user knows what's not in the container but should be.
Its not always easy for the user to know what exact command is being run
when the 'docker run' is embedded deep in something else, like a Makefile.
Saw this while dealing with the containerd migration.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-03-20 18:15:46 -07:00
Mike Goelzer
d1502afb63 Pass upstream client's user agent through to registry on image pulls 
Changes how the Engine interacts with Registry servers on image pull.
Previously, Engine sent a User-Agent string to the Registry server
that included only the Engine's version information.  This commit
appends to that string the fields from the User-Agent sent by the
client (e.g., Compose) of the Engine.  This allows Registry server
operators to understand what tools are actually generating pulls on
their registries.

Signed-off-by: Mike Goelzer <mgoelzer@docker.com>
 2016-03-20 04:30:09 -07:00
Jess Frazelle
b77573f48e Merge pull request #21274 from jfrazelle/fix-variables-that-werent-being-used 
fix variables that werent being called
 2016-03-18 18:03:15 -07:00
Brian Goff
81707de23f Don't forward SIGPIPE from client to container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-18 16:50:18 -04:00
Tonis Tiigi
9c4570a958 Replace execdrivers with containerd implementation 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-03-18 13:38:32 -07:00
Vincent Demeester
6c6363c726 Merge pull request #21269 from mlaventure/inspect-bind-mounts 
Update inspect/ps to properly handle bind mounts
 2016-03-18 20:52:02 +01:00
allencloud
f1d34ac2eb fix typos in several files 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-03-18 12:51:57 +08:00