Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.

Commit dbf67a6

Browse files
tonistiigitonistiigi
authored
Merge pull request moby#453 from AkihiroSuda/vendor-runc-20180616
vendor runc ad0f5255060d36872be04de22f8731f38ef2d7b1
2 parents e0b9d14 + 7690ff1 commit dbf67a6

5 files changed

Lines changed: 21 additions & 20 deletions

File tree

‎util/libcontainer_specconv/example.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func ToRootlessWithContext(ctx RootlessContext, spec *specs.Spec, opts *Rootless
8383

8484
// Add mappings for the current user.
8585
if ctx.InUserNS {
86-
uNextContainerID := 0
86+
uNextContainerID := int64(0)
8787
sort.Sort(idmapSorter(ctx.UIDMap))
8888
for _, uidmap := range ctx.UIDMap {
8989
spec.Linux.UIDMappings = append(spec.Linux.UIDMappings,
@@ -94,7 +94,7 @@ func ToRootlessWithContext(ctx RootlessContext, spec *specs.Spec, opts *Rootless
9494
})
9595
uNextContainerID += uidmap.Count
9696
}
97-
gNextContainerID := 0
97+
gNextContainerID := int64(0)
9898
sort.Sort(idmapSorter(ctx.GIDMap))
9999
for _, gidmap := range ctx.GIDMap {
100100
spec.Linux.GIDMappings = append(spec.Linux.GIDMappings,
@@ -118,7 +118,7 @@ func ToRootlessWithContext(ctx RootlessContext, spec *specs.Spec, opts *Rootless
118118
Size: 1,
119119
}}
120120
if opts.MapSubUIDGID {
121-
uNextContainerID := 1
121+
uNextContainerID := int64(1)
122122
sort.Sort(subIDSorter(ctx.SubUIDs))
123123
for _, subuid := range ctx.SubUIDs {
124124
spec.Linux.UIDMappings = append(spec.Linux.UIDMappings,
@@ -129,7 +129,7 @@ func ToRootlessWithContext(ctx RootlessContext, spec *specs.Spec, opts *Rootless
129129
})
130130
uNextContainerID += subuid.Count
131131
}
132-
gNextContainerID := 1
132+
gNextContainerID := int64(1)
133133
sort.Sort(subIDSorter(ctx.SubGIDs))
134134
for _, subgid := range ctx.SubGIDs {
135135
spec.Linux.GIDMappings = append(spec.Linux.GIDMappings,

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
1818
github.com/golang/protobuf v1.1.0
1919
github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b
2020
github.com/opencontainers/image-spec v1.0.1
21-
github.com/opencontainers/runc 0e561642f81e84ebd0b3afd6ec510c75a2ccb71b
21+
github.com/opencontainers/runc ad0f5255060d36872be04de22f8731f38ef2d7b1
2222
github.com/Microsoft/go-winio v0.4.7
2323
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
2424
github.com/opencontainers/runtime-spec v1.0.1

‎vendor/github.com/opencontainers/runc/libcontainer/configs/validate/rootless.go‎

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

‎vendor/github.com/opencontainers/runc/libcontainer/system/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.

‎vendor/github.com/opencontainers/runc/libcontainer/user/user.go‎

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

0 commit comments

Comments
 (0)