Граф коммитов

9154 Коммитов

Автор SHA1 Сообщение Дата
Arnaud Porterie 4290f40c05 Merge pull request #386 from crosbymichael/dep
Add deprecation notice
2016-09-08 23:21:04 +00:00
Michael Crosby d1862dad42 Add deprecation notice
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-08 14:06:57 -07:00
Tibor Vass 611c63f512 Merge pull request #382 from tonistiigi/fix-go17
Fix CI for go1.7
2016-09-02 17:12:24 -07:00
Tonis Tiigi a04a45cdba Fix CI for go1.7
govet detected a case where we copy tls.Config although
the var contains mutexes. This is fixed in go1.8 with a
stdlib Clone method. Temporarily add a local copy of that 
function until we can move to go1.8 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-09-02 16:49:42 -07:00
Vincent Demeester f9cef59044 Merge pull request #313 from runcom/new-seccomp-format
types: new seccomp format
2016-08-31 16:25:38 +02:00
Antonio Murdaca 2ecb57916b
types: new seccomp format
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-31 16:21:08 +02:00
Madhu Venugopal fc442f7161 Merge pull request #380 from mrjana/drun
Add deprecation note for ServiceSpec.Networks
2016-08-30 16:16:10 -07:00
Jana Radhakrishnan 5c4b684b2f Add deprecation note for ServiceSpec.Networks
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-08-30 14:45:31 -07:00
Vincent Demeester 7cf26e0abb Merge pull request #372 from yongtang/368-network-create-default-ipam
Change IPAM driver type to pointer to avoid default value
2016-08-30 22:38:41 +02:00
Vincent Demeester f52a1ff447 Merge pull request #369 from stevvooe/heartbeat-should-be-duration
swarm: clarify meaning of time related fields
2016-08-30 22:34:53 +02:00
John Howard 003df11958 Merge pull request #323 from jwendell/24355
types/configs: Add Env to ExecConfig struct
2016-08-30 13:30:08 -07:00
Vincent Demeester 9140772fe5 Merge pull request #378 from allencloud/add-ContainerUpdateResponse-in-update-api
add ContainerUpdateResponse in update api
2016-08-30 20:44:15 +02:00
allencloud 2e95858dee add ContainerUpdateResponse in update api
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-29 17:31:33 +08:00
Brian Goff fa0eea948c Merge pull request #375 from mrjana/drun
Add NetworkAttachmentConfig to TaskSpec
2016-08-27 11:03:20 -04:00
Jana Radhakrishnan 3f8a8281aa Add NetworkAttachmentConfig to TaskSpec
With this change NetworkAttachmentConfig moves to TaskSpec. We will
continue to support setting the NetworkAttachmentConfig in ServiceSpec
in addition to supporting it in TaskSpec.

Also added `ManuallyAttachable` flag to NetworkCreateRequest and
NetworkResource types.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-08-26 17:25:24 -07:00
Victor Vieux 8d8fffdf86 Merge pull request #377 from vieux/update_comment_plugin_inspect
update function comment
2016-08-26 15:38:54 -04:00
Victor Vieux b126142489 update function comment
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-25 19:40:32 -07:00
Brian Goff b66d7d91db Merge pull request #376 from vieux/plugin_inspect
add -f to plugin inspect
2016-08-25 15:30:08 -04:00
Jonh Wendell 6f11843155 types/configs: Add Env to ExecConfig struct
This allows env variables to be passed to exec command.

Docker Engine PR: https://github.com/docker/docker/pull/24594

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
2016-08-24 18:24:23 -03:00
Vincent Demeester 2f8c367944 Merge pull request #302 from jinuxstyle/improve-connection-error-msg-v2
Add host to the connection error message
2016-08-19 17:30:17 +02:00
Jin Xu 8efb4f189d Add host to the connection error message
When running docker client against a swarm cluster and connection to a
node failed, it's not obvious to figure out the targeting host from the
error message.

This is related to issue: https://github.com/docker/swarm/issues/2393

Signed-off-by: Jin Xu <jinuxstyle@hotmail.com>
v2: remove socket in the error message
2016-08-19 09:59:48 +08:00
Victor Vieux 16b29aad6e add -f to plugin inspect
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-17 05:04:43 -07:00
Yong Tang 7803ba3c0b Change IPAM driver type to pointer to avoid default value
This fix tries to address the issue raised in 368 and docker/25735
where NetworkCreate needs to set up the IPAM driver type. Otherwise
an error will be returned.

This fix change IPAM driver type to pointer so that `/networks/create`
does not the explicit specification of IPAM driver any more.

This fix fixes 368.

This fix is related to docker/25735.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-17 03:20:56 -07:00
Sebastiaan van Stijn c9fd33c910 Merge pull request #350 from yongtang/24270-service-list-filter-task-index
Add Annotations to Task definition to fix partial/full filter issue in `service tasks --filter`
2016-08-17 00:55:04 +02:00
Stephen J Day c46dfa1e6d
swarm: clarify meaning of time related fields
Several fields in the `RaftConfig` and `DispatcherConfig` structures
lack clarification about their meaning in relation to time. While all
these fields describe a time-period, they have subtle yet important
differences in their meanings.

`HeartbeatPeriod` is an open time period, meaning the amount of time
between heartbeats for nodes communicating with the dispatcher. This
field has always been specified in nanoseconds and has been converted
directly to a `time.Duration` field. This will have impact except for a
slightly different type. The values used via the API will be identical,
so there is no impact.

`HeartbeatTick` and `ElectionTick` specify the period in units of ticks,
which are configured as one second in the manager. The role of these
fields is clarified and their relation with time is described
accordingly.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-08-16 12:29:56 -07:00
Tibor Vass 94a8f8f293 Merge pull request #351 from vieux/enabled
replace .Active by .Enabled
2016-08-15 17:41:22 -07:00
Victor Vieux a48ffaa7cc replace .Active by .Enabled
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-15 17:07:39 -07:00
Alexander Morozov ebc51d1954 Merge pull request #356 from tamird/server-resp-not-pointer
client: pass `serverResponse` around by value
2016-08-15 12:54:26 -07:00
Alexander Morozov db49fd5efa Merge pull request #366 from cpuguy83/more_error_handling_fixes
Fixes more issues swallowing connection errors
2016-08-15 11:36:46 -07:00
Brian Goff 809c1bdc54 Fixes more issues swallowing connection errors
Really need to make sure we are only returning `ErrConnectionFailed`
when it's really a failed connection, not just something that reports as
a non-temporary error.

This fixes more tests on docker CI.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-15 12:47:42 -04:00
Vincent Demeester 3ae7fcd11e Merge pull request #364 from stevvooe/add-tty-and-groups
swarm/container: add support for TTY and supplementary groups
2016-08-14 19:14:43 +02:00
Vincent Demeester fdb5acc8f4 Merge pull request #363 from cpuguy83/add_build_squash
Add options for build squashing
2016-08-14 19:12:22 +02:00
Stephen J Day 2a1311921a
swarm/container: add support for TTY and supplementary groups
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-08-12 12:51:03 -07:00
Alexander Morozov a55b27b2dc Merge pull request #362 from cpuguy83/fix_connect_errors
Correct order of error checking on connect failure
2016-08-12 12:38:37 -07:00
Brian Goff 4f34d8e18a Add options for build squashing
Related to docker/docker#22641

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-12 15:36:30 -04:00
Brian Goff bd4776a59a Correct order of error checking on connect failure
1730fe8fb0 changed error checking to use
the `Temporary()` function from `net.Error`. Unfortunately having this
check so high up it is catching more than we really want it to and
causing the custom error checks below it to not be caught.

This moves the net.Error check to last since it is the most generic
check.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-12 14:05:30 -04:00
Brian Goff 1de6a79199 Merge pull request #360 from thaJeztah/remove-size-query-param
Remove unused "size" query parameter
2016-08-11 18:39:36 -04:00
Sebastiaan van Stijn 1e9b026e8c
Remove unused "size" query parameter
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-11 23:27:49 +02:00
Alexander Morozov faa11eca6a Merge pull request #309 from hqhq/remove_execdriver
Remove execution driver
2016-08-11 11:53:11 -07:00
Alexander Morozov a47f92828a Merge pull request #359 from cpuguy83/fix_volume_nocopy
Fix wrong field name on mount: s/Populate/NoCopy
2016-08-11 11:36:43 -07:00
Brian Goff 90377596ef Fix wrong field name on mount: s/Populate/NoCopy
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-11 14:32:12 -04:00
Brian Goff b54bc2593f Merge pull request #258 from cpuguy83/better_mounts_api
Add new APIs for safer mount specifications
2016-08-11 12:27:23 -04:00
Vincent Demeester 3342859391 Merge pull request #357 from LK4D4/race_free_cancellable
cancellable: use sync.Once to prevent double channel close
2016-08-11 09:50:11 +02:00
Alexander Morozov d8ae3d962c cancellable: use sync.Once to prevent double channel close
Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
2016-08-10 10:47:56 -07:00
Vincent Demeester fc564829f6 Merge pull request #349 from tamird/docker-cannot-connect-context
client: only return ErrConnectionFailed on fatal network errors
2016-08-09 20:19:22 +02:00
Vincent Demeester 2f203293b3 Merge pull request #355 from tamird/dont-decorate-context-errors
request: don't decorate context errors
2016-08-09 20:18:40 +02:00
Tamir Duberstein 6922bf580b
client: pass `serverResponse` around by value
Removes a bunch of impossible and useless nil checks.

Signed-off-by: Tamir Duberstein <tamird@gmail.com>
2016-08-09 13:21:54 -04:00
Tamir Duberstein 4d0d10bed9
request: don't decorate context errors
Comparing directly to sentinels is handy when implementing retries.

Signed-off-by: Tamir Duberstein <tamird@gmail.com>
2016-08-09 11:12:26 -04:00
Tamir Duberstein 1730fe8fb0
client: only return ErrConnectionFailed on fatal network errors
Fixes #347.

Signed-off-by: Tamir Duberstein <tamird@gmail.com>
2016-08-09 10:55:57 -04:00
Brian Goff d8662f7f77 Merge pull request #321 from yongtang/23367-out-of-band-volume-driver-deletion
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
2016-08-09 10:39:50 -04:00