Skip to content

Commit

Permalink
chore: update docker and k8s
Browse files Browse the repository at this point in the history
  • Loading branch information
ldez authored and traefiker committed Aug 5, 2019
1 parent 2b5c7f9 commit c2d440a
Show file tree
Hide file tree
Showing 1,283 changed files with 69,088 additions and 29,265 deletions.
243 changes: 152 additions & 91 deletions Gopkg.lock

Large diffs are not rendered by default.

27 changes: 16 additions & 11 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -203,19 +203,19 @@ required = [

[[constraint]]
name = "k8s.io/client-go"
version = "8.0.0" # 8.0.0
version = "kubernetes-1.15.1" # kubernetes-1.15.1

[[constraint]]
name = "k8s.io/code-generator"
version = "kubernetes-1.11.7"
version = "kubernetes-1.15.1" # "kubernetes-1.15.1"

[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.11.7" # "kubernetes-1.11.7"
version = "kubernetes-1.15.1" # "kubernetes-1.15.1"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.11.7" # "kubernetes-1.11.7"
version = "kubernetes-1.15.1" # "kubernetes-1.15.1"

[[override]]
name = "github.com/json-iterator/go"
Expand All @@ -235,28 +235,29 @@ required = [

[[constraint]]
name = "github.com/docker/docker"
revision = "7848b8beb9d38a98a78b75f78e05f8d2255f9dfe"
source = "github.com/docker/engine"
version = "v19.03.1"

[[override]]
name = "github.com/docker/docker"
revision = "7848b8beb9d38a98a78b75f78e05f8d2255f9dfe"
source = "github.com/docker/engine"
version = "v19.03.1"

[[override]]
name = "github.com/docker/cli"
revision = "6b63d7b96a41055baddc3fa71f381c7f60bd5d8e"
version = "v19.03.1"

[[override]]
name = "github.com/docker/distribution"
revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
version = "v2.7.1"

[[override]]
branch = "master"
name = "github.com/docker/libcompose"

[[override]]
name = "github.com/Nvveen/Gotty"
revision = "a8b993ba6abdb0e0c12b0125c603323a71c7790c"
source = "github.com/ijc25/Gotty"
name = "github.com/xeipuuv/gojsonschema"
version = "v1.1.0"

[[override]]
# ALWAYS keep this override
Expand All @@ -282,3 +283,7 @@ required = [
[[constraint]]
name = "github.com/ExpediaDotCom/haystack-client-go"
version = "0.2.3"

[[constraint]]
name = "gopkg.in/yaml.v2"
version = "v2.2.2"
2 changes: 1 addition & 1 deletion pkg/provider/docker/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func taskState(state swarm.TaskState) func(*swarm.TaskStatus) {

func taskContainerStatus(id string) func(*swarm.TaskStatus) {
return func(status *swarm.TaskStatus) {
status.ContainerStatus = swarm.ContainerStatus{
status.ContainerStatus = &swarm.ContainerStatus{
ContainerID: id,
}
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c2d440a

Please sign in to comment.