kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request from thaJeztah/load_frozen_images

Browse source 
integration: fix TestBuildUserNamespaceValidateCapabilitiesAreV2 not using frozen image
This commit is contained in:
Sebastiaan van Stijn 2021-01-13 18:50:22 +01:00 • committed by GitHub
commit 41e5d459f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions

13
integration/build/build_userns_linux_test.go
View file

@ -15,6 +15,7 @@ import (
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/testutil/daemon"
"github.com/docker/docker/testutil/fakecontext"
"github.com/docker/docker/testutil/fixtures/load"
"gotest.tools/v3/assert"
"gotest.tools/v3/skip"
)
@ -36,7 +37,13 @@ func TestBuildUserNamespaceValidateCapabilitiesAreV2(t *testing.T) {
defer os.RemoveAll(tmp)
dUserRemap := daemon.New(t)
dUserRemap.StartWithBusybox(t, "--userns-remap", "default")
dUserRemap.Start(t, "--userns-remap", "default")
ctx := context.Background()
clientUserRemap := dUserRemap.NewClientT(t)
err = load.FrozenImagesLinux(clientUserRemap, "buildpack-deps:buster")
assert.NilError(t, err)
dUserRemapRunning := true
defer func() {
if dUserRemapRunning {
@ -49,11 +56,9 @@ func TestBuildUserNamespaceValidateCapabilitiesAreV2(t *testing.T) {
RUN setcap CAP_NET_BIND_SERVICE=+eip /bin/sleep
`
ctx := context.Background()
source := fakecontext.New(t, "", fakecontext.WithDockerfile(dockerfile))
defer source.Close()
clientUserRemap := dUserRemap.NewClientT(t)
resp, err := clientUserRemap.ImageBuild(ctx,
source.AsTarReader(t),
types.ImageBuildOptions{
@ -89,7 +94,7 @@ func TestBuildUserNamespaceValidateCapabilitiesAreV2(t *testing.T) {
dUserRemapRunning = false
dNoUserRemap := daemon.New(t)
dNoUserRemap.StartWithBusybox(t)
dNoUserRemap.Start(t)
defer dNoUserRemap.Stop(t)
clientNoUserRemap := dNoUserRemap.NewClientT(t)