mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
01ae9525dd
Commit0380fbff37
added the ability to pass a --platform flag on `docker import` when importing an archive. The intent of that commit was to allow importing a Linux rootfs on a Windows daemon (as part of the experimental LCOW feature). A later commit (337ba71fc1
) changed some of this code to take both OS and Architecture into account (for `docker build` and `docker pull`), but did not yet update the `docker image import`. This patch updates the import endpoitn to allow passing both OS and Architecture. Note that currently only matching OSes are accepted, and an error will be produced when (e.g.) specifying `linux` on Windows and vice-versa. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
147 lines
4 KiB
Go
147 lines
4 KiB
Go
package image // import "github.com/docker/docker/integration/image"
|
|
|
|
import (
|
|
"archive/tar"
|
|
"bytes"
|
|
"context"
|
|
"io"
|
|
"runtime"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/image"
|
|
"github.com/docker/docker/testutil"
|
|
"github.com/docker/docker/testutil/daemon"
|
|
"gotest.tools/v3/assert"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
// Ensure we don't regress on CVE-2017-14992.
|
|
func TestImportExtremelyLargeImageWorks(t *testing.T) {
|
|
skip.If(t, testEnv.IsRemoteDaemon, "cannot run daemon when remote daemon")
|
|
skip.If(t, runtime.GOARCH == "arm64", "effective test will be time out")
|
|
skip.If(t, testEnv.OSType == "windows", "TODO enable on windows")
|
|
t.Parallel()
|
|
|
|
// Spin up a new daemon, so that we can run this test in parallel (it's a slow test)
|
|
d := daemon.New(t)
|
|
d.Start(t)
|
|
defer d.Stop(t)
|
|
|
|
client := d.NewClientT(t)
|
|
|
|
// Construct an empty tar archive with about 8GB of junk padding at the
|
|
// end. This should not cause any crashes (the padding should be mostly
|
|
// ignored).
|
|
var tarBuffer bytes.Buffer
|
|
|
|
tw := tar.NewWriter(&tarBuffer)
|
|
err := tw.Close()
|
|
assert.NilError(t, err)
|
|
imageRdr := io.MultiReader(&tarBuffer, io.LimitReader(testutil.DevZero, 8*1024*1024*1024))
|
|
reference := strings.ToLower(t.Name()) + ":v42"
|
|
|
|
_, err = client.ImageImport(context.Background(),
|
|
types.ImageImportSource{Source: imageRdr, SourceName: "-"},
|
|
reference,
|
|
types.ImageImportOptions{})
|
|
assert.NilError(t, err)
|
|
}
|
|
|
|
func TestImportWithCustomPlatform(t *testing.T) {
|
|
skip.If(t, testEnv.OSType == "windows", "TODO enable on windows")
|
|
|
|
defer setupTest(t)()
|
|
client := testEnv.APIClient()
|
|
ctx := context.Background()
|
|
|
|
// Construct an empty tar archive.
|
|
var tarBuffer bytes.Buffer
|
|
|
|
tw := tar.NewWriter(&tarBuffer)
|
|
err := tw.Close()
|
|
assert.NilError(t, err)
|
|
imageRdr := io.MultiReader(&tarBuffer, io.LimitReader(testutil.DevZero, 0))
|
|
|
|
tests := []struct {
|
|
name string
|
|
platform string
|
|
expected image.V1Image
|
|
expectedErr string
|
|
}{
|
|
{
|
|
platform: "",
|
|
expected: image.V1Image{
|
|
OS: runtime.GOOS,
|
|
Architecture: runtime.GOARCH, // this may fail on armhf due to normalization?
|
|
},
|
|
},
|
|
{
|
|
platform: " ",
|
|
expectedErr: "is an invalid component",
|
|
},
|
|
{
|
|
platform: "/",
|
|
expectedErr: "is an invalid component",
|
|
},
|
|
{
|
|
platform: runtime.GOOS,
|
|
expected: image.V1Image{
|
|
OS: runtime.GOOS,
|
|
Architecture: runtime.GOARCH, // this may fail on armhf due to normalization?
|
|
},
|
|
},
|
|
{
|
|
platform: strings.ToUpper(runtime.GOOS),
|
|
expected: image.V1Image{
|
|
OS: runtime.GOOS,
|
|
Architecture: runtime.GOARCH, // this may fail on armhf due to normalization?
|
|
},
|
|
},
|
|
{
|
|
platform: runtime.GOOS + "/sparc64",
|
|
expected: image.V1Image{
|
|
OS: runtime.GOOS,
|
|
Architecture: "sparc64",
|
|
},
|
|
},
|
|
{
|
|
platform: "macos",
|
|
expectedErr: "operating system is not supported",
|
|
},
|
|
{
|
|
platform: "macos/arm64",
|
|
expectedErr: "operating system is not supported",
|
|
},
|
|
{
|
|
// TODO: platforms.Normalize() only validates os or arch if a single component is passed,
|
|
// but ignores unknown os/arch in other cases. See:
|
|
// https://github.com/containerd/containerd/blob/7d4891783aac5adf6cd83f657852574a71875631/platforms/platforms.go#L183-L209
|
|
platform: "nintendo64",
|
|
expectedErr: "unknown operating system or architecture",
|
|
},
|
|
}
|
|
|
|
for i, tc := range tests {
|
|
tc := tc
|
|
t.Run(tc.platform, func(t *testing.T) {
|
|
reference := "import-with-platform:tc-" + strconv.Itoa(i)
|
|
_, err = client.ImageImport(context.Background(),
|
|
types.ImageImportSource{Source: imageRdr, SourceName: "-"},
|
|
reference,
|
|
types.ImageImportOptions{Platform: tc.platform})
|
|
if tc.expectedErr != "" {
|
|
assert.ErrorContains(t, err, tc.expectedErr)
|
|
} else {
|
|
assert.NilError(t, err)
|
|
|
|
inspect, _, err := client.ImageInspectWithRaw(ctx, reference)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, inspect.Os, tc.expected.OS)
|
|
assert.Equal(t, inspect.Architecture, tc.expected.Architecture)
|
|
}
|
|
})
|
|
}
|
|
}
|