Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 74ceaef

Browse files
Merge component 'engine' from git@github.com:docker/engine 19.03
2 parents 3e58daa + e88a6af commit 74ceaef

47 files changed

Lines changed: 847 additions & 3674 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

components/engine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#
2626

2727
ARG CROSS="false"
28-
ARG GO_VERSION=1.12.15
28+
ARG GO_VERSION=1.12.16
2929
ARG DEBIAN_FRONTEND=noninteractive
3030

3131
FROM golang:${GO_VERSION}-stretch AS base

components/engine/Dockerfile.e2e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.12.15
1+
ARG GO_VERSION=1.12.16
22

33
FROM golang:${GO_VERSION}-alpine AS base
44

components/engine/Dockerfile.simple

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# This represents the bare minimum required to build and test Docker.
77

8-
ARG GO_VERSION=1.12.15
8+
ARG GO_VERSION=1.12.16
99

1010
FROM golang:${GO_VERSION}-stretch
1111

components/engine/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
165165
# Use PowerShell as the default shell
166166
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
167167

168-
ARG GO_VERSION=1.12.15
168+
ARG GO_VERSION=1.12.16
169169

170170
# Environment variable notes:
171171
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.

components/engine/vendor.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ github.com/imdario/mergo 7c29201646fa3de8506f70121347
2626
golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c
2727

2828
# buildkit
29-
github.com/moby/buildkit 926935b590c94c3659ebcc49cf44da47c1a65ff6
30-
github.com/tonistiigi/fsutil 0f039a052ca1da01626278199624b62aed9b3729
29+
github.com/moby/buildkit 57e8ad52170d713233569f6d467e609d2b0f90c9
30+
github.com/tonistiigi/fsutil 6c909ab392c173a4264ae1bfcbc0450b9aac0c7d
3131
github.com/grpc-ecosystem/grpc-opentracing 8e809c8a86450a29b90dcc9efbf062d0fe6d9746
3232
github.com/opentracing/opentracing-go 1361b9cd60be79c4c3a7fa9841b3c132e40066a7
3333
github.com/google/shlex 6f45313302b9c56850fc17f99e40caebce98c716
@@ -128,13 +128,13 @@ github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266
128128
github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0
129129

130130
# cluster
131-
github.com/docker/swarmkit f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 # bump_v19.03 branch
131+
github.com/docker/swarmkit 062b694b46c0744d601eebef79f3f7433d808a04 # bump_v19.03 branch
132132
github.com/gogo/protobuf ba06b47c162d49f2af050fb4c75bcbc86a159d5c # v1.2.1
133133
github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5 # v1.2.0
134134
github.com/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2
135135
github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2
136136
github.com/google/certificate-transparency-go 37a384cd035e722ea46e55029093e26687138edf # v1.0.20
137-
golang.org/x/crypto 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
137+
golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
138138
golang.org/x/time fbb02b2291d28baffd63558aa44b4b56f178d650
139139
github.com/hashicorp/go-memdb cb9a474f84cc5e41b273b20c6927680b2a8776ad
140140
github.com/hashicorp/go-immutable-radix 826af9ccf0feeee615d546d69b11f8e98da8c8f1 git://github.com/tonistiigi/go-immutable-radix.git

components/engine/vendor/github.com/docker/swarmkit/agent/agent.go

Lines changed: 28 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/engine/vendor/github.com/moby/buildkit/go.mod

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/engine/vendor/github.com/moby/buildkit/solver/llbsolver/file/backend.go

Lines changed: 48 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/engine/vendor/github.com/moby/buildkit/solver/llbsolver/file/unpack.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/engine/vendor/github.com/moby/buildkit/solver/llbsolver/file/user_linux.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)