496aca386a
Merge pull request #20190 from rhatdan/volumeMan
...
Add a parent man page for docker volumes command
2016-03-10 22:36:50 +01:00
2b8e7ad460
Merge pull request #20478 from msabansal/HNSIntegration
...
Windows libnetwork integration
2016-03-10 13:33:04 -08:00
59586d02b1
Move registry service options to the daemon configuration.
...
Allowing to set their values in the daemon configuration file.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-10 11:53:11 -05:00
9ff7439162
Merge pull request #20983 from Microsoft/jstarks/fix_save_powershell_remoting
...
Windows: Revendor github.com/Microsoft/go-winio
2016-03-10 08:28:36 -08:00
790d8f8520
Merge pull request #21018 from hqhq/hq_fix_race_exec_tty
...
Fix race condition when exec with tty
2016-03-10 08:27:54 -08:00
943ae26bc0
Merge pull request #20958 from calavera/basic_function_templates
...
Provide basic string manipulation functions for template executions.
2016-03-10 08:08:32 -08:00
04e9087d5d
Merge branch 'master' of github.com:docker/docker into volumeMan
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-03-10 09:39:16 -05:00
e7093a95cf
Merge pull request #21043 from runcom/plugin-sdk
...
docs: extend: plugins: mention the sdk + systemd socket activation
2016-03-10 15:12:23 +01:00
97e07ca10a
docs: extend: plugins: mention the sdk + systemd socket activation
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-10 12:17:06 +01:00
f70f570641
Merge pull request #21073 from moxiegirl/close-carry-20377
...
Add missing fields for NetworkSettings
2016-03-10 10:59:15 +01:00
e8026d8a98
Windows libnetwork integration
...
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-03-09 20:33:21 -08:00
49485b769c
Merge pull request #21063 from allencloud/fix-typos
...
fix some typos.
2016-03-09 20:24:56 -08:00
d99be399c3
Merge pull request #21019 from aboch/se
...
Add port configs to Sandbox and libnetwork vendoring
2016-03-09 22:27:37 -05:00
34b82a69b9
fix some typos.
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-10 10:09:27 +08:00
bd7c95e306
Merge pull request #21074 from mlaventure/test-userns-centos
...
Update UserNamespaceInKernel test requirement to handle redhat
2016-03-09 17:53:13 -08:00
8514880997
Provide basic string manupilation functions for template executions.
...
This change centralizes the template manipulation in a single package
and adds basic string functions to their execution.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-09 19:37:12 -05:00
b8a5fb76ea
Add Exposed ports and port-mapping configs to Sandbox
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-09 14:07:23 -08:00
76cd0f6811
Update docs to mention identity token usage for /auth
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-03-09 13:47:57 -08:00
ba0aa5311a
Add support for identity tokens in client credentials store
...
Update unit test and documentation to handle the new case where Username
is set to <token> to indicate an identity token is involved.
Change the "Password" field in communications with the credential helper
to "Secret" to make clear it has a more generic purpose.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-09 13:47:57 -08:00
a6d0c66b4c
Change Docker client to support OAuth-based flow for login
...
This mechanism exchanges basic auth credentials for an identity token.
The identity token is used going forward to request scoped-down tokens
to use for registry operations.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-09 13:47:57 -08:00
e896d1d7c4
Add support for identity token with token handler
...
Use token handler options for initialization.
Update auth endpoint to set identity token in response.
Update credential store to match distribution interface changes.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-03-09 13:47:57 -08:00
5730259f32
Vendor updates to distribution
...
Pull in changes for refresh token in the registry client
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-03-09 13:47:57 -08:00
fcff343cb4
Merge pull request #21067 from LK4D4/remove_comment
...
Remove obsolete comment
2016-03-09 13:27:12 -08:00
205844875c
Add missing fields for NetworkSettings
...
Dump from 1.10.1 has this fields.
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
Close and carry #20377
Include David's request
Signed-off-by: Mary Anthony <mary@docker.com>
2016-03-09 12:43:48 -08:00
6cbff9505c
Update UserNamespaceInKernel test requirement to handle redhat
...
On redhat based distribution, checking that USER_NS is compiled in the
kernel is not sufficient, we also have to check that the feature as
been enabled.
With this commit, it is now done by checking the content of
`/sys/module/user_namespace/parameters/enable`.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-03-09 12:42:59 -08:00
9bfdb93e3a
Merge pull request #21053 from WeiZhang555/vendor-engine-api
...
Vendor docker/engine-api
2016-03-09 15:19:26 -05:00
8706c5124a
Remove obsolete comment
...
There is no more race
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-09 09:38:39 -08:00
f97ab358cb
Merge pull request #21013 from calavera/events_since_nano
...
Compare event nanoseconds properly to filter since a specific date.
2016-03-09 09:30:54 -08:00
016be53236
Merge pull request #21056 from askb/optimize-TestBuildUsersAndGroups
...
Optimized integration test case DockerSuite.TestBuildUsersAndGroups fixes #19425
2016-03-09 09:15:01 -08:00
94c929099f
1.return status code http.StatusNoContent in deleting network when successful
...
2.modify docker_api_network_test.go
3.modify docker_remote_api_v1.23.md
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-10 00:28:55 +08:00
5d3ae7f989
Merge pull request #20965 from yongtang/19425-DockerSuite.TestRunUnshareProc
...
Optimize slow bottleneck test of DockerSuite.TestRunUnshareProc.
2016-03-09 10:32:09 -05:00
faacbcf53e
Merge pull request #20930 from cloojure/patch-3
...
Update dockernetworks.md
2016-03-09 15:58:38 +01:00
deeb5c95e2
Optimized integration test case DockerSuite.TestBuildUsersAndGroups for #19425
...
Removed unnecessary RUN statements and combined some of the RUN statement into a single line.
The runtime performance is seen as follows:
pre-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
63.074s
post-change:
PASS: docker_cli_build_test.go:3826: DockerSuite.TestBuildUsersAndGroups
49.698s
Signed-off-by: Anil Belur <askb23@gmail.com>
2016-03-09 18:00:56 +05:30
f446771f0b
Vendor docker/engine-api
...
Vendor docker/engine-api 9bab0d5b73872e53dfadfa055dcc519e57b09439
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-03-09 15:52:44 +08:00
3d09842713
Merge pull request #21033 from estesp/workdir-perms-userns
...
Ensure WORKDIR is created with remapped root ownership
2016-03-09 07:22:08 +01:00
5a65408941
Vendoring libnetwork v0.7.0-dev.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-08 18:47:02 -08:00
0771230daa
Merge pull request #20342 from vijaykilari/fix_20325
...
#20325 : arm64: Use gccgo as bootstrap for compiling golang
2016-03-08 16:11:42 -08:00
6b0119aefb
Merge pull request #20940 from HackToday/fixsave
...
Refine error message when save non-exist image
2016-03-09 00:59:43 +01:00
a9f2006f10
Compare event nanoseconds properly to filter since a specific date.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-08 17:07:58 -05:00
dd32445ecc
Merge pull request #18697 from jfrazelle/pids-cgroup
...
Add PIDs cgroup support to Docker
2016-03-08 14:03:36 -08:00
76a5ab3b43
Merge pull request #21035 from LK4D4/exec_ids
...
make TestExecInspectIDs less racy
2016-03-08 13:02:01 -08:00
95bc1f1ccd
Merge pull request #21032 from trishnaguha/docker-group
...
Creates docker group for non-root access
2016-03-08 21:50:44 +01:00
6d6919ed79
Merge pull request #20995 from wenchma/ping_timeout
...
Update ping command timeout to 4 sec
2016-03-08 15:35:00 -05:00
845dce8465
Windows: Revendor github.com/Microsoft/go-winio
...
This fixes docker save when the daemon was launched from a remote
PowerShell session.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-03-08 12:27:48 -08:00
471e434400
Merge pull request #21036 from jfrazelle/fix-release-generation
...
only add the suites that exist we dont need the script for this
2016-03-08 15:11:49 -05:00
dc702b6c6b
Merge pull request #20727 from mrunalp/no_new_priv
...
Add support for NoNewPrivileges in docker
2016-03-08 14:26:15 -05:00
38e1cd1dc1
Merge pull request #20975 from runcom/secretservice-creds-store
...
cliconfig: credentials: set default for unix
2016-03-08 11:17:12 -08:00
0ab5805c08
only add the suites that exist we dont need the script for this
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-03-08 11:08:00 -08:00
8dd8ec137e
make TestExecInspectIDs less racy
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-08 09:51:39 -08:00
799a6b94ee
Ensure WORKDIR is created with remapped root ownership
...
Correct creation of a non-existing WORKDIR during docker build to use
remapped root uid/gid on mkdir
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-03-08 11:58:55 -05:00
Sebastiaan van Stijn
Arnaud Porterie
David Calavera
Alexander Morozov
Dan Walsh
Antonio Murdaca
msabansal
Aaron Lehmann
Brian Goff
allencloud
Alessandro Boch
Derek McGowan
Kanstantsin Shautsou
Kenfe-Mickael Laventure
Alexander Morozov
Tõnis Tiigi
Phil Estes
Anil Belur
Zhang Wei
Antonio Murdaca
Tianon Gravi
John Starks
Tibor Vass
Jessica Frazelle
Phil Estes