713c7d49a1
This removes various skips that accounted for running the integration tests
against older versions of the daemon before 20.10 (API version v1.41). Those
versions are EOL, and we don't run tests against them.
This reverts most of e440831802, and similar
PRs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
72 lines
2.5 KiB
Go
72 lines
2.5 KiB
Go
package image // import "github.com/docker/docker/integration/image"
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/integration/internal/container"
|
|
"github.com/docker/docker/testutil/daemon"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
func TestCommitInheritsEnv(t *testing.T) {
|
|
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "FIXME")
|
|
ctx := setupTest(t)
|
|
|
|
client := testEnv.APIClient()
|
|
|
|
cID1 := container.Create(ctx, t, client)
|
|
imgName := strings.ToLower(t.Name())
|
|
|
|
commitResp1, err := client.ContainerCommit(ctx, cID1, containertypes.CommitOptions{
|
|
Changes: []string{"ENV PATH=/bin"},
|
|
Reference: imgName,
|
|
})
|
|
assert.NilError(t, err)
|
|
|
|
image1, _, err := client.ImageInspectWithRaw(ctx, commitResp1.ID)
|
|
assert.NilError(t, err)
|
|
|
|
expectedEnv1 := []string{"PATH=/bin"}
|
|
assert.Check(t, is.DeepEqual(expectedEnv1, image1.Config.Env))
|
|
|
|
cID2 := container.Create(ctx, t, client, container.WithImage(image1.ID))
|
|
|
|
commitResp2, err := client.ContainerCommit(ctx, cID2, containertypes.CommitOptions{
|
|
Changes: []string{"ENV PATH=/usr/bin:$PATH"},
|
|
Reference: imgName,
|
|
})
|
|
assert.NilError(t, err)
|
|
|
|
image2, _, err := client.ImageInspectWithRaw(ctx, commitResp2.ID)
|
|
assert.NilError(t, err)
|
|
expectedEnv2 := []string{"PATH=/usr/bin:/bin"}
|
|
assert.Check(t, is.DeepEqual(expectedEnv2, image2.Config.Env))
|
|
}
|
|
|
|
// Verify that files created are owned by the remapped user even after a commit
|
|
func TestUsernsCommit(t *testing.T) {
|
|
skip.If(t, testEnv.DaemonInfo.OSType != "linux")
|
|
skip.If(t, testEnv.IsRemoteDaemon())
|
|
skip.If(t, !testEnv.IsUserNamespaceInKernel())
|
|
skip.If(t, testEnv.IsRootless())
|
|
|
|
ctx := context.Background()
|
|
dUserRemap := daemon.New(t, daemon.WithUserNsRemap("default"))
|
|
dUserRemap.StartWithBusybox(ctx, t)
|
|
clientUserRemap := dUserRemap.NewClientT(t)
|
|
defer clientUserRemap.Close()
|
|
|
|
container.Run(ctx, t, clientUserRemap, container.WithName(t.Name()), container.WithImage("busybox"), container.WithCmd("sh", "-c", "echo hello world > /hello.txt && chown 1000:1000 /hello.txt"))
|
|
img, err := clientUserRemap.ContainerCommit(ctx, t.Name(), containertypes.CommitOptions{})
|
|
assert.NilError(t, err)
|
|
|
|
res := container.RunAttach(ctx, t, clientUserRemap, container.WithImage(img.ID), container.WithCmd("sh", "-c", "stat -c %u:%g /hello.txt"))
|
|
assert.Check(t, is.Equal(res.ExitCode, 0))
|
|
assert.Check(t, is.Equal(res.Stderr.String(), ""))
|
|
assert.Assert(t, is.Equal(strings.TrimSpace(res.Stdout.String()), "1000:1000"))
|
|
}
|