From 10c35196b19389da5bb64921b7e1f23eb054c739 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 3 Jun 2016 02:27:17 -0700 Subject: [PATCH] Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6 This fix tries to update engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6 This fix brings engine-api up to date, which includes changes from: https://github.com/docker/engine-api/pull/256 https://github.com/docker/engine-api/pull/254 This fix is related to Signed-off-by: Yong Tang --- hack/vendor.sh | 2 +- .../github.com/docker/engine-api/types/container/config.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index 84a3a1b1cd..cfd2a2f698 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -60,7 +60,7 @@ clone git golang.org/x/net 78cb2c067747f08b343f20614155233ab4ea2ad3 https://gith clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3 clone git github.com/docker/go-connections v0.2.0 -clone git github.com/docker/engine-api fa04f66c7871183dd53a5ec666479f49b452743d +clone git github.com/docker/engine-api 5d8739372315f8147ceb7bcc53576893ff96ffc6 clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837 clone git github.com/imdario/mergo 0.2.1 diff --git a/vendor/src/github.com/docker/engine-api/types/container/config.go b/vendor/src/github.com/docker/engine-api/types/container/config.go index 81dd94d4cc..707fc8c174 100644 --- a/vendor/src/github.com/docker/engine-api/types/container/config.go +++ b/vendor/src/github.com/docker/engine-api/types/container/config.go @@ -1,9 +1,10 @@ package container import ( + "time" + "github.com/docker/engine-api/types/strslice" "github.com/docker/go-connections/nat" - "time" ) // HealthConfig holds configuration settings for the HEALTHCHECK feature. @@ -56,4 +57,6 @@ type Config struct { OnBuild []string // ONBUILD metadata that were defined on the image Dockerfile Labels map[string]string // List of labels set to this container StopSignal string `json:",omitempty"` // Signal to stop a container + StopTimeout *int `json:",omitempty"` // Timeout (in seconds) to stop a container + Shell strslice.StrSlice `json:",omitempty"` // Shell for shell-form of RUN, CMD, ENTRYPOINT }