Skip to content

Commit a596de8

Browse files
committed
bump docker/docker to a30990b3c8d0d42280fa501287859e1d2393a951
full diff: moby/moby@b6684a4...a30990b relevant changes: - moby/moby#39995 Update containerd binary to v1.2.10 - moby/moby#40001 Update runc to v1.0.0-rc8-92-g84373aaa (CVE-2019-16884) - moby/moby#39999 bump golang 1.13.1 (CVE-2019-16276) - moby/moby#40102 bump golang 1.13.3 (CVE-2019-17596) - moby/moby#39994 homedir: add cgo or osusergo buildtag constraints for unix. This is to ensure that users of the homedir package cannot compile statically (`CGO_ENABLED=0`) without also setting the `osusergo` build tag. - moby/moby#39983 builder: remove legacy build's session handling This feature was used by docker build --stream and it was kept experimental. Users of this endpoint should enable BuildKit anyway by setting Version to BuilderBuildKit. - Related: docker#2105 build: remove --stream (was experimental) - moby/moby #40045 Bump logrus 1.4.2, go-shellwords, mergo, flock, creack/pty, golang/gddo, gorilla/mux - moby/moby#39713 bump containerd and dependencies to v1.3.0 - moby/moby#39987 Add ability to handle index acknowledgment with splunk log driver - moby/moby#40070 Use ocischema package instead of custom handler - relates to moby/moby#39727 Docker 19.03 doesn't support OCI image - relates to docker/hub-feedback#1871 - relates to distribution/distribution#3024 - moby/moby#39231 Add support for sending down service Running and Desired task counts - moby/moby#39822 daemon: Use short libnetwork ID in exec-root Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent fa879df commit a596de8

File tree

30 files changed

+129
-92
lines changed

30 files changed

+129
-92
lines changed

cli/command/container/hijack.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ func setRawTerminal(streams command.Streams) error {
185185
return streams.Out().SetRawTerminal()
186186
}
187187

188-
// nolint: unparam
189188
func restoreTerminal(streams command.Streams, in io.Closer) error {
190189
streams.In().RestoreTerminal()
191190
streams.Out().RestoreTerminal()

cli/command/formatter/reflect_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func (d *dummy) Func1() string {
1212
return "Func1"
1313
}
1414

15-
func (d *dummy) func2() string { // nolint: unused
15+
func (d *dummy) func2() string {
1616
return "func2(should not be marshalled)"
1717
}
1818

cli/command/image/trust.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ func convertTarget(t client.Target) (target, error) {
344344
}
345345

346346
// TagTrusted tags a trusted ref
347-
// nolint: interfacer
348347
func TagTrusted(ctx context.Context, cli command.Cli, trustedRef reference.Canonical, ref reference.NamedTagged) error {
349348
// Use familiar references when interacting with client and output
350349
familiarRef := reference.FamiliarString(ref)

cli/command/manifest/push.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ func buildBlobRequestList(imageManifest types.ImageManifest, repoName reference.
208208
return blobReqs, nil
209209
}
210210

211-
// nolint: interfacer
212211
func buildPutManifestRequest(imageManifest types.ImageManifest, targetRef reference.Named) (mountRequest, error) {
213212
refWithoutTag, err := reference.WithName(targetRef.Name())
214213
if err != nil {

cli/command/trust/signer_remove.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ func isLastSignerForReleases(roleWithSig data.Role, allRoles []client.RoleWithSi
7878

7979
// removeSingleSigner attempts to remove a single signer and returns whether signer removal happened.
8080
// The signer not being removed doesn't necessarily raise an error e.g. user choosing "No" when prompted for confirmation.
81-
// nolint: unparam
8281
func removeSingleSigner(cli command.Cli, repoName, signerName string, forceYes bool) (bool, error) {
8382
ctx := context.Background()
8483
imgRefAndAuth, err := trust.GetImageReferencesAndAuth(ctx, nil, image.AuthResolver(cli), repoName)

gometalinter.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
"Vendor": true,
33
"Deadline": "2m",
44
"Sort": ["linter", "severity", "path", "line"],
5-
"Exclude": [
5+
"Skip": [
66
"cli/compose/schema/bindata.go",
77
"cli/command/stack/kubernetes/api/openapi",
88
"cli/command/stack/kubernetes/api/client",
99
".*generated.*",
10-
"parameter .* always receives"
10+
"vendor"
11+
],
12+
"Exclude": [
13+
"Get not declared by package homedir",
14+
"parameter .* always receives",
15+
"_esc(Dir|FS|FSString|FSMustString) is unused"
1116
],
1217
"EnableGC": true,
1318
"Linters": {

internal/pkg/containerized/snapshot.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type revision struct {
9292
mounts []mount.Mount
9393
}
9494

95-
// nolint: interfacer
95+
//nolint:interfacer
9696
func create(ctx context.Context, client *containerd.Client, i containerd.Image, id string, previous string) (*revision, error) {
9797
diffIDs, err := i.RootFS(ctx)
9898
if err != nil {
@@ -135,7 +135,7 @@ func save(ctx context.Context, client *containerd.Client, updatedImage container
135135
return snapshot, nil
136136
}
137137

138-
// nolint: interfacer
138+
//nolint:interfacer
139139
func previous(ctx context.Context, client *containerd.Client, c *containers.Container) (*revision, error) {
140140
service := client.SnapshotService(c.Snapshotter)
141141
sInfo, err := service.Stat(ctx, c.SnapshotKey)

vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff7826
1616
github.com/dgrijalva/jwt-go a2c85815a77d0f951e33ba4db5ae93629a1530af
1717
github.com/docker/compose-on-kubernetes cc4914dfd1b6684a9750a59f3613fc0a95291824 # v0.4.23
1818
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
19-
github.com/docker/docker b6684a403c99aaf6be5b8ce0bef3c6650fcdcd12
19+
github.com/docker/docker a30990b3c8d0d42280fa501287859e1d2393a951
2020
github.com/docker/docker-credential-helpers 54f0238b6bf101fc3ad3b34114cb5520beb562f5 # v0.6.3
2121
github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 # Contains a customized version of canonical/json and is used by Notary. The package is periodically rebased on current Go versions.
2222
github.com/docker/go-connections 7395e3f8aa162843a74ed6d48e79627d9792ac55 # v0.4.0

vendor/github.com/docker/docker/api/types/client.go

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

vendor/github.com/docker/docker/api/types/filters/parse.go

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

0 commit comments

Comments
 (0)