From b953d1781cc4f59a5795a051be24774c74a685b9 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Tue, 16 Jul 2024 15:05:50 +0300 Subject: [PATCH 1/3] add support for volumes Signed-off-by: Avi Deitcher --- docs/yaml.md | 77 ++++++++++++++++--- examples/volumes.yml | 45 ++++++++++++ src/cmd/linuxkit/moby/build/build.go | 67 ++++++++++++++++- src/cmd/linuxkit/moby/build/image.go | 19 +++-- src/cmd/linuxkit/moby/build/volume.go | 102 ++++++++++++++++++++++++++ src/cmd/linuxkit/moby/config.go | 88 ++++++++++++++++++++++ src/cmd/linuxkit/moby/const.go | 1 + src/cmd/linuxkit/moby/schema.go | 16 +++- 8 files changed, 396 insertions(+), 19 deletions(-) create mode 100644 examples/volumes.yml create mode 100644 src/cmd/linuxkit/moby/build/volume.go diff --git a/docs/yaml.md b/docs/yaml.md index c04ad17e0..b04e13e81 100644 --- a/docs/yaml.md +++ b/docs/yaml.md @@ -3,7 +3,7 @@ The `linuxkit build` command assembles a set of containerised components into in image. The simplest type of image is just a `tar` file of the contents (useful for debugging) but more useful outputs add a `Dockerfile` to build a container, or build a full disk image that can be -booted as a linuxKit VM. The main use case is to build an assembly that includes +booted as a linuxkit VM. The main use case is to build an assembly that includes `containerd` to run a set of containers, but the tooling is very generic. The yaml configuration specifies the components used to build up an image . All components @@ -16,8 +16,10 @@ The Docker images are optionally verified with Docker Content Trust. For private registries or private repositories on a registry credentials provided via `docker login` are re-used. +## Sections + The configuration file is processed in the order `kernel`, `init`, `onboot`, `onshutdown`, -`services`, `files`. Each section adds files to the root file system. Sections may be omitted. +`services`, `files`, `volumes`. Each section adds files to the root file system. Sections may be omitted. Each container that is specified is allocated a unique `uid` and `gid` that it may use if it wishes to run as an isolated user (or user namespace). Anywhere you specify a `uid` or `gid` @@ -40,7 +42,7 @@ files: mode: "0600" ``` -## `kernel` +### `kernel` The `kernel` section is only required if booting a VM. The files will be put into the `boot/` directory, where they are used to build bootable images. @@ -57,7 +59,7 @@ Kernel packages may also contain a cpio archive containing CPU microcode which n the initrd. To select this option, recommended when booting on bare metal, add `ucode: intel-ucode.cpio` to the kernel section. -## `init` +### `init` The `init` section is a list of images that are used for the `init` system and are unpacked directly into the root filesystem. This should bring up `containerd`, start the system and daemon containers, @@ -65,14 +67,14 @@ and set up basic filesystem mounts. in the case of a LinuxKit system. For ease o modification `runc` and `containerd` images, which just contain these programs are added here rather than bundled into the `init` container. -## `onboot` +### `onboot` The `onboot` section is a list of images. These images are run before any other images. They are run sequentially and each must exit before the next one is run. These images can be used to configure one shot settings. See [Image specification](#image-specification) for a list of supported fields. -## `onshutdown` +### `onshutdown` This is a list of images to run on a clean shutdown. Note that you must not rely on these being run at all, as machines may be be powered off or shut down without having time to run @@ -81,18 +83,67 @@ run and when they are not. Most systems are likely to be "crash only" and not ha but you can attempt to deregister cleanly from a network service here, rather than relying on timeouts, for example. -## `services` +### `services` The `services` section is a list of images for long running services which are run with `containerd`. Startup order is undefined, so containers should wait on any resources, such as networking, that they need. See [Image specification](#image-specification) for a list of supported fields. -## `files` +### `volumes` + +The volumes section is a list of named volumes that can be used by other containers, +including those in `services`, `onboot` and `onshutdown`. The volumes are created in a directory +chosen by linuxkit at build-time. The volumes then can be referenced by other containers and +mounted into them. + +Volumes normally are blank directories. If an image is provided, the contents of that image +will be used to populate the volume. + +The `volumes` section can declare a volume to be read-write or read-only. If the volume is read-write, +a volume that is mounted into a container can be mounted read-only or read-write. If the volume is read-only, +it can be mounted into a container read-only; attempting to do so read-write will generate a build-time error. +By default, volumes are created read-write, and are mounted read-write. + +Volume names **must** be unique, and must contain only lower-case alphanumeric characters, hyphens, and +underscores. + +Sample `volumes` section: + +```yml +volumes: +- name: vola + image: alpine:latest + readonly: true +- name: volb + image: alpine:latest + readonly: false +- name: volc + readonly: false +``` + +In the above example: + +* `vola` is populated by the contents of `alpine:latest` and is read-only. +* `volb` is populated by the contents of `alpine:latest` and is read-write. +* `volc` is an empty volume and is read-write. + +Sample usage of volumes in `services` section: + +```yml +services: +- name: myservice + image: alpine:latest + binds: + - volA:/mnt/volA:ro + - volB:/mnt/volB +``` + +### `files` The files section can be used to add files inline in the config, or from an external file. -``` +```yml files: - path: dir directory: true @@ -118,7 +169,8 @@ user's home directory. In addition there is a `metadata` option that will generate the file. Currently the only value supported here is `"yaml"` which will output the yaml used to generate the image into the specified file: -``` + +```yml - path: etc/linuxkit.yml metadata: yaml ``` @@ -130,7 +182,7 @@ Because a `tmpfs` is mounted onto `/var`, `/run`, and `/tmp` by default, the `tm ## Image specification -Entries in the `onboot` and `services` sections specify an OCI image and +Entries in the `onboot`, `onshutdown`, `volumes` and `services` sections specify an OCI image and options. Default values may be specified using the `org.mobyproject.config` image label. For more details see the [OCI specification](https://github.com/opencontainers/runtime-spec/blob/master/spec.md). @@ -205,7 +257,8 @@ which specifies some actions to take place when the container is being started. - `namespace` overrides the LinuxKit default containerd namespace to put the container in; only applicable to services. An example of using the `runtime` config to configure a network namespace with `wireguard` and then run `nginx` in that namespace is shown below: -``` + +```yml onboot: - name: dhcpcd image: linuxkit/dhcpcd: diff --git a/examples/volumes.yml b/examples/volumes.yml new file mode 100644 index 000000000..7ef2b1f11 --- /dev/null +++ b/examples/volumes.yml @@ -0,0 +1,45 @@ +# example with volumes, both blank and populated +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:8a7b6cdb89197dc94eb6db69ef9dc90b750db598 + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f + - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff +onboot: + - name: sysctl + image: linuxkit/sysctl:5a374e4bf3e5a7deeacff6571d0f30f7ea8f56db + - name: dhcpcd + image: linuxkit/dhcpcd:e9e3580f2de00e73e7b316a007186d22fea056ee + command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] +onshutdown: + - name: shutdown + image: busybox:latest + command: ["/bin/echo", "so long and thanks for all the fish"] +services: + - name: getty + image: linuxkit/getty:5d86a2ce2d890c14ab66b13638dcadf74f29218b + env: + - INSECURE=true + - name: rngd + image: linuxkit/rngd:cdb919e4aee49fed0bf6075f0a104037cba83c39 + - name: nginx + image: nginx:1.19.5-alpine + capabilities: + - CAP_NET_BIND_SERVICE + - CAP_CHOWN + - CAP_SETUID + - CAP_SETGID + - CAP_DAC_OVERRIDE + binds: + - /etc/resolv.conf:/etc/resolv.conf + - blank:/blank + - alpine:/alpine +volumes: +- name: blank # blank volume +- name: alpine # populated volume + image: alpine:3.19 +files: + - path: etc/linuxkit-config + metadata: yaml diff --git a/src/cmd/linuxkit/moby/build/build.go b/src/cmd/linuxkit/moby/build/build.go index 10c8fde00..bc01af963 100644 --- a/src/cmd/linuxkit/moby/build/build.go +++ b/src/cmd/linuxkit/moby/build/build.go @@ -99,7 +99,13 @@ func outputImage(image *moby.Image, section string, index int, prefix string, m if err != nil { return fmt.Errorf("failed to retrieve config for %s: %v", image.Image, err) } - oci, runtime, err := moby.ConfigToOCI(image, configRaw, idMap) + // use a modified version of onboot which replaces volume names with paths + imageWithVolPaths, err := updateMountsAndBindsFromVolumes(image, m) + if err != nil { + return fmt.Errorf("failed update image %s from volumes: %w", image.Image, err) + } + + oci, runtime, err := moby.ConfigToOCI(imageWithVolPaths, configRaw, idMap) if err != nil { return fmt.Errorf("failed to create OCI spec for %s: %v", image.Image, err) } @@ -256,6 +262,65 @@ func Build(m moby.Moby, w io.Writer, opts BuildOpts) error { return err } + if len(m.Volumes) != 0 { + log.Infof("Add volumes:") + } + + for i, vol := range m.Volumes { + log.Infof("Process volume image: %s", vol.Name) + // there is an Image, so we need to extract it, either from inputTar or from the image + if oldConfig != nil && len(oldConfig.Volumes) > i && oldConfig.Volumes[i].Image == vol.Image { + if err := extractPackageFilesFromTar(in, iw, vol.Image, fmt.Sprintf("volumes[%d]", i)); err != nil { + return err + } + continue + } + location := fmt.Sprintf("volume[%d]", i) + lower, tmpDir, merged := vol.LowerDir(), vol.TmpDir(), vol.MergedDir() + lowerPath := strings.TrimPrefix(lower, "/") + "/" + + // get volume tarball from container + if err := ImageTar(location, vol.ImageRef(), lowerPath, apkTar, resolvconfSymlink, opts); err != nil { + return fmt.Errorf("failed to build volume tarball from %s: %v", vol.Name, err) + } + // make upper and merged dirs which will be used for mounting + // no need to make lower dir, as it is made automatically by ImageTar() + // the existence of an upper dir indicates that it is read-write and should be overlayfs. + if !vol.ReadOnly { + // need the tmp dir where work gets done, since the whole thing fs is read-only + tmpPath := strings.TrimPrefix(tmpDir, "/") + "/" + tmphdr := &tar.Header{ + Name: tmpPath, + Mode: 0755, + Typeflag: tar.TypeDir, + ModTime: defaultModTime, + Format: tar.FormatPAX, + PAXRecords: map[string]string{ + moby.PaxRecordLinuxkitSource: "linuxkit.volumes", + moby.PaxRecordLinuxkitLocation: location, + }, + } + if err := apkTar.WriteHeader(tmphdr); err != nil { + return err + } + } + mergedPath := strings.TrimPrefix(merged, "/") + "/" + mhdr := &tar.Header{ + Name: mergedPath, + Mode: 0755, + Typeflag: tar.TypeDir, + ModTime: defaultModTime, + Format: tar.FormatPAX, + PAXRecords: map[string]string{ + moby.PaxRecordLinuxkitSource: "linuxkit.volumes", + moby.PaxRecordLinuxkitLocation: location, + }, + } + if err := apkTar.WriteHeader(mhdr); err != nil { + return err + } + } + if len(m.Onboot) != 0 { log.Infof("Add onboot containers:") } diff --git a/src/cmd/linuxkit/moby/build/image.go b/src/cmd/linuxkit/moby/build/image.go index 6715c0f4a..b7476231a 100644 --- a/src/cmd/linuxkit/moby/build/image.go +++ b/src/cmd/linuxkit/moby/build/image.go @@ -142,7 +142,7 @@ var touch = map[string]tar.Header{ // tarPrefix creates the leading directories for a path // path is the path to prefix, location is where this appears in the linuxkit.yaml file -func tarPrefix(path, location string, ref *reference.Spec, tw tarWriter) error { +func tarPrefix(path, location, refName string, tw tarWriter) error { if path == "" { return nil } @@ -163,7 +163,7 @@ func tarPrefix(path, location string, ref *reference.Spec, tw tarWriter) error { Typeflag: tar.TypeDir, Format: tar.FormatPAX, PAXRecords: map[string]string{ - moby.PaxRecordLinuxkitSource: ref.String(), + moby.PaxRecordLinuxkitSource: refName, moby.PaxRecordLinuxkitLocation: location, }, } @@ -178,16 +178,25 @@ func tarPrefix(path, location string, ref *reference.Spec, tw tarWriter) error { // ImageTar takes a Docker image and outputs it to a tar stream // location is where it is in the linuxkit.yaml file func ImageTar(location string, ref *reference.Spec, prefix string, tw tarWriter, resolv string, opts BuildOpts) (e error) { - log.Debugf("image tar: %s %s", ref, prefix) + refName := "empty" + if ref != nil { + refName = ref.String() + } + log.Debugf("image tar: %s %s", refName, prefix) if prefix != "" && prefix[len(prefix)-1] != '/' { return fmt.Errorf("prefix does not end with /: %s", prefix) } - err := tarPrefix(prefix, location, ref, tw) + err := tarPrefix(prefix, location, refName, tw) if err != nil { return err } + // if the image is blank, we do not need to do any more + if ref == nil { + return nil + } + // pullImage first checks in the cache, then pulls the image. // If pull==true, then it always tries to pull from registry. src, err := imagePull(ref, opts.Pull, opts.CacheDir, opts.DockerCache, opts.Arch) @@ -364,7 +373,7 @@ func ImageBundle(prefix, location string, ref *reference.Spec, config []byte, ru } dupMap[ref.String()] = root } else { - if err := tarPrefix(prefix+"/", location, ref, tw); err != nil { + if err := tarPrefix(prefix+"/", location, ref.String(), tw); err != nil { return err } root = dupMap[ref.String()] diff --git a/src/cmd/linuxkit/moby/build/volume.go b/src/cmd/linuxkit/moby/build/volume.go new file mode 100644 index 000000000..006ee3e5a --- /dev/null +++ b/src/cmd/linuxkit/moby/build/volume.go @@ -0,0 +1,102 @@ +package build + +import ( + "fmt" + "strings" + + "github.com/linuxkit/linuxkit/src/cmd/linuxkit/moby" +) + +func updateMountsAndBindsFromVolumes(image *moby.Image, m moby.Moby) (*moby.Image, error) { + // clean image to send back + img := *image + if img.Mounts != nil { + for i, mount := range *img.Mounts { + // only care about type bind + if mount.Type != "bind" { + continue + } + // starts with / = not a volume + if strings.HasPrefix(mount.Source, "/") { + continue + } + vol := m.VolByName(mount.Source) + if vol == nil { + return nil, fmt.Errorf("volume %s not found in onboot image mount %d", mount.Source, i) + } + merged := vol.MergedDir() + // make sure it is not read-write if the underlying volume is read-only + if vol.ReadOnly { + var foundReadOnly bool + for _, opt := range mount.Options { + if opt == "rw" { + foundReadOnly = false + break + } + if opt == "ro" { + foundReadOnly = true + break + } + } + if !foundReadOnly { + return nil, fmt.Errorf("volume %s is read-only, but attempting to write into container read-write", mount.Source) + } + } + mount.Source = merged + } + } + if img.Binds != nil { + var newBinds []string + for i, bind := range *img.Binds { + parts := strings.Split(bind, ":") + // starts with / = not a volume + if strings.HasPrefix(parts[0], "/") { + newBinds = append(newBinds, bind) + continue + } + source := parts[0] + // split + vol := m.VolByName(source) + if vol == nil { + return nil, fmt.Errorf("volume %s not found in onboot image bin %d", source, i) + } + merged := vol.MergedDir() + if vol.ReadOnly { + if len(parts) < 3 || parts[2] != "ro" { + return nil, fmt.Errorf("volume %s is read-only, but attempting to write into container read-write", source) + } + } + parts[0] = merged + newBinds = append(newBinds, strings.Join(parts, ":")) + } + img.Binds = &newBinds + } + if img.BindsAdd != nil { + var newBinds []string + for i, bind := range *img.BindsAdd { + parts := strings.Split(bind, ":") + // starts with / = not a volume + if strings.HasPrefix(parts[0], "/") { + newBinds = append(newBinds, bind) + continue + } + source := parts[0] + vol := m.VolByName(source) + // split + if vol == nil { + return nil, fmt.Errorf("volume %s not found in onboot image bin %d", parts[0], i) + } + merged := vol.MergedDir() + if vol.ReadOnly { + if len(parts) < 3 || parts[2] != "ro" { + return nil, fmt.Errorf("volume %s is read-only, but attempting to write into container read-write", source) + } + } + parts[0] = merged + newBinds = append(newBinds, strings.Join(parts, ":")) + } + img.BindsAdd = &newBinds + } + + return &img, nil +} diff --git a/src/cmd/linuxkit/moby/config.go b/src/cmd/linuxkit/moby/config.go index 5e7ac0029..179b7abb5 100644 --- a/src/cmd/linuxkit/moby/config.go +++ b/src/cmd/linuxkit/moby/config.go @@ -4,6 +4,8 @@ import ( "bytes" "fmt" "os" + "path" + "regexp" "sort" "strconv" "strings" @@ -19,6 +21,8 @@ import ( "gopkg.in/yaml.v3" ) +var nameRE = regexp.MustCompile(`^[a-z0-9_-]*$`) + // Moby is the type of a Moby config file type Moby struct { Kernel KernelConfig `kernel:"cmdline,omitempty" json:"kernel,omitempty"` @@ -27,14 +31,20 @@ type Moby struct { Onshutdown []*Image `yaml:"onshutdown" json:"onshutdown"` Services []*Image `yaml:"services" json:"services"` Files []File `yaml:"files" json:"files"` + Volumes []*Volume `yaml:"volumes" json:"volumes"` initRefs []*reference.Spec + vols map[string]*Volume } func (m Moby) InitRefs() []*reference.Spec { return m.initRefs } +func (m Moby) VolByName(name string) *Volume { + return m.vols[name] +} + // KernelConfig is the type of the config for a kernel type KernelConfig struct { Image string `yaml:"image" json:"image"` @@ -64,6 +74,34 @@ type File struct { GID interface{} `yaml:"gid,omitempty" json:"gid,omitempty"` } +// Volume is the type of a volume specification +type Volume struct { + Name string `yaml:"name" json:"name"` + Image string `yaml:"image,omitempty" json:"image,omitempty"` + ReadOnly bool `yaml:"readonly,omitempty" json:"readonly,omitempty"` + ref *reference.Spec +} + +func (v Volume) ImageRef() *reference.Spec { + return v.ref +} + +func (v Volume) BaseDir() string { + return volumeBaseDir(v.Name) +} + +func (v Volume) LowerDir() string { + return volumeLowerDir(v.Name) +} + +func (v Volume) TmpDir() string { + return volumeTmpDir(v.Name) +} + +func (v Volume) MergedDir() string { + return volumeMergedDir(v.Name) +} + // Image is the type of an image config type Image struct { Name string `yaml:"name" json:"name"` @@ -210,6 +248,37 @@ func uniqueServices(m Moby) error { return nil } +func uniqueVolumes(m *Moby) error { + // volume names must be unique + m.vols = map[string]*Volume{} + for _, v := range m.Volumes { + if !nameRE.MatchString(v.Name) { + return fmt.Errorf("invalid volume name: %s", v.Name) + } + if _, ok := m.vols[v.Name]; ok { + return fmt.Errorf("duplicate volume name: %s", v.Name) + } + m.vols[v.Name] = v + } + return nil +} + +func volumeBaseDir(name string) string { + return path.Join(allVolumesBaseDir, name) +} + +func volumeLowerDir(name string) string { + return path.Join(volumeBaseDir(name), "lower") +} + +func volumeTmpDir(name string) string { + return path.Join(volumeBaseDir(name), "tmp") +} + +func volumeMergedDir(name string) string { + return path.Join(volumeBaseDir(name), "merged") +} + func extractReferences(m *Moby) error { if m.Kernel.Image != "" { r, err := reference.Parse(util.ReferenceExpand(m.Kernel.Image)) @@ -246,6 +315,16 @@ func extractReferences(m *Moby) error { } image.ref = &r } + for _, image := range m.Volumes { + if image.Image == "" { + continue + } + r, err := reference.Parse(util.ReferenceExpand(image.Image)) + if err != nil { + return fmt.Errorf("extract volume image reference: %v", err) + } + image.ref = &r + } return nil } @@ -318,6 +397,10 @@ func NewConfig(config []byte, packageFinder spec.PackageResolver) (Moby, error) return m, err } + if err := uniqueVolumes(&m); err != nil { + return m, err + } + if err := extractReferences(&m); err != nil { return m, err } @@ -352,6 +435,11 @@ func AppendConfig(m0, m1 Moby) (Moby, error) { moby.Services = append(moby.Services, m1.Services...) moby.Files = append(moby.Files, m1.Files...) moby.initRefs = append(moby.initRefs, m1.initRefs...) + moby.Volumes = append(moby.Volumes, m1.Volumes...) + moby.vols = map[string]*Volume{} + for k, v := range m1.vols { + moby.vols[k] = v + } return moby, uniqueServices(moby) } diff --git a/src/cmd/linuxkit/moby/const.go b/src/cmd/linuxkit/moby/const.go index d2b786def..e2fd3681c 100644 --- a/src/cmd/linuxkit/moby/const.go +++ b/src/cmd/linuxkit/moby/const.go @@ -6,4 +6,5 @@ const ( // PaxRecordLinuxkitLocation report the location of the file in the linuxkit.yaml // that led to this file being in this location PaxRecordLinuxkitLocation = "LINUXKIT.location" + allVolumesBaseDir = "/containers/volumes" ) diff --git a/src/cmd/linuxkit/moby/schema.go b/src/cmd/linuxkit/moby/schema.go index fd91d0be4..d8af60ddb 100644 --- a/src/cmd/linuxkit/moby/schema.go +++ b/src/cmd/linuxkit/moby/schema.go @@ -37,6 +37,19 @@ var schema = ` "type": "array", "items": { "$ref": "#/definitions/file" } }, + "volume": { + "type": "object", + "additionalProperties": false, + "properties": { + "name": {"type": "string"}, + "image": {"type": "string"}, + "readonly": {"type": "boolean"} + } + }, + "volumes": { + "type": "array", + "items": { "$ref": "#/definitions/volume" } + }, "trust": { "type": "object", "additionalProperties": false, @@ -333,7 +346,8 @@ var schema = ` "onshutdown": { "$ref": "#/definitions/images" }, "services": { "$ref": "#/definitions/images" }, "trust": { "$ref": "#/definitions/trust" }, - "files": { "$ref": "#/definitions/files" } + "files": { "$ref": "#/definitions/files" }, + "volumes": { "$ref": "#/definitions/volumes" } } } ` From a5085fc9ea0f76210551e59f7b096e5420016718 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 18 Jul 2024 17:54:25 +0300 Subject: [PATCH 2/3] pkg/init support for volumes Signed-off-by: Avi Deitcher --- examples/addbinds.yml | 2 +- examples/cadvisor.yml | 2 +- examples/containerd-debug.yml | 2 +- examples/dm-crypt-loop.yml | 2 +- examples/dm-crypt.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/getty.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/influxdb-os.yml | 2 +- examples/logging.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/platform-aws.yml | 2 +- examples/platform-azure.yml | 2 +- examples/platform-equinixmetal.yml | 2 +- examples/platform-gcp.yml | 2 +- examples/platform-hetzner.yml | 2 +- examples/platform-rt-for-vmware.yml | 2 +- examples/platform-scaleway.yml | 2 +- examples/platform-vmware.yml | 2 +- examples/platform-vultr.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/static-ip.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/volumes.yml | 4 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- pkg/init/Dockerfile | 5 + pkg/init/cmd/service/cmd.go | 2 +- pkg/init/cmd/service/main.go | 5 +- pkg/init/cmd/service/system_init.go | 2 +- pkg/init/cmd/service/volumeinit.go | 95 +++++++++++++++++++ .../clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- src/cmd/linuxkit/moby/build/mkimage.yaml | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- test/cases/000_build/001_tarheaders/test.yml | 2 +- .../cases/000_build/010_reproducible/test.yml | 2 +- test/cases/000_build/020_binds/test.yml | 2 +- test/cases/000_build/050_sbom/test.yml | 2 +- .../060_input_tar/000_build/test1.yml | 2 +- .../060_input_tar/000_build/test2.yml | 2 +- .../060_input_tar/010_same_filename/test.yml | 2 +- .../000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../000_qemu/005_run_kernel+squashfs/test.yml | 2 +- .../000_qemu/010_run_iso/test.yml | 2 +- .../000_qemu/020_run_efi/test.yml | 2 +- .../000_qemu/030_run_qcow_bios/test.yml | 2 +- .../000_qemu/040_run_raw_bios/test.yml | 2 +- .../000_qemu/050_run_aws/test.yml | 2 +- .../000_qemu/100_container/test.yml | 2 +- .../000_run_kernel+initrd/test.yml | 2 +- .../005_run_kernel+squashfs/test.yml | 2 +- .../010_hyperkit/010_acpi/test.yml | 2 +- .../010_platforms/110_gcp/000_run/test.yml | 2 +- .../020_kernel/011_config_5.4.x/test.yml | 2 +- .../020_kernel/013_config_5.10.x/test.yml | 2 +- .../020_kernel/016_config_5.15.x/test.yml | 2 +- .../020_kernel/019_config_6.6.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- .../cases/020_kernel/113_kmod_5.10.x/test.yml | 2 +- .../cases/020_kernel/116_kmod_5.15.x/test.yml | 2 +- test/cases/020_kernel/119_kmod_6.6.x/test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../test.yml | 2 +- .../010_echo-short-1con-single/test.yml | 2 +- .../test.yml | 2 +- .../011_echo-short-10con-single/test.yml | 2 +- .../test.yml | 2 +- .../012_echo-short-5con-multi/test.yml | 2 +- .../test.yml | 2 +- .../015_echo-long-1con-single/test.yml | 2 +- .../test.yml | 2 +- .../016_echo-long-10con-single/test.yml | 2 +- .../017_echo-long-5con-multi-reverse/test.yml | 2 +- .../017_echo-long-5con-multi/test.yml | 2 +- .../010_veth-unix-domain-echo/test.yml | 2 +- .../test.yml | 2 +- .../100_mix/012_veth-ipv4-echo/test.yml | 2 +- .../100_mix/013_veth-ipv6-echo/test.yml | 2 +- .../100_mix/014_veth-tcp-echo/test.yml | 2 +- .../100_mix/015_veth-udp-echo/test.yml | 2 +- .../100_mix/020_unix-domain-echo/test.yml | 2 +- .../cases/020_kernel/200_namespace/common.yml | 2 +- .../030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/001_dummy/test.yml | 2 +- test/cases/040_packages/002_bcc/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- .../040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_cgroupv2/test.yml | 2 +- .../040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- .../004_dm-crypt/000_simple/test.yml | 2 +- .../004_dm-crypt/001_luks/test.yml | 2 +- .../004_dm-crypt/002_key/test.yml | 2 +- .../005_extend/000_ext4/test-create.yml | 2 +- .../040_packages/005_extend/000_ext4/test.yml | 2 +- .../005_extend/001_btrfs/test-create.yml | 2 +- .../005_extend/001_btrfs/test.yml | 2 +- .../005_extend/002_xfs/test-create.yml | 2 +- .../040_packages/005_extend/002_xfs/test.yml | 2 +- .../005_extend/003_gpt/test-create.yml | 2 +- .../040_packages/005_extend/003_gpt/test.yml | 2 +- .../006_format_mount/000_auto/test.yml | 2 +- .../006_format_mount/001_by_label/test.yml | 2 +- .../006_format_mount/002_by_name/test.yml.in | 2 +- .../006_format_mount/003_btrfs/test.yml | 2 +- .../006_format_mount/004_xfs/test.yml | 2 +- .../005_by_device_force/test.yml | 2 +- .../006_format_mount/006_gpt/test.yml | 2 +- .../006_format_mount/010_multiple/test.yml | 2 +- .../007_getty-containerd/test.yml | 2 +- .../040_packages/009_init_containerd/test.yml | 2 +- test/cases/040_packages/011_kmsg/test.yml | 2 +- test/cases/040_packages/012_logwrite/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- .../013_metadata/000_cidata/test.yml | 2 +- .../040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- .../cases/040_packages/023_wireguard/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 4 +- 187 files changed, 290 insertions(+), 187 deletions(-) create mode 100644 pkg/init/cmd/service/volumeinit.go diff --git a/examples/addbinds.yml b/examples/addbinds.yml index e5491d834..4bb6912ee 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index c936e65db..b68f1570a 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/containerd-debug.yml b/examples/containerd-debug.yml index 7876e3734..767876a6d 100644 --- a/examples/containerd-debug.yml +++ b/examples/containerd-debug.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index aabb803df..c6db5635d 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 3ad4c3ce3..aa6a3e172 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index d846d39e8..aa15282d6 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:77e45e4681c78d59f1d8a48818260948d55f9d05 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/docker.yml b/examples/docker.yml index 4548903e4..0af2e2591 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/getty.yml b/examples/getty.yml index d04c4d943..d34f03b1a 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index c4de61114..1394de250 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index a0bc6876e..77f377379 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/logging.yml b/examples/logging.yml index 602b3f7db..d1fb0da5a 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/minimal.yml b/examples/minimal.yml index f6ce0d3f2..fcd12172c 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 2c7d3704b..913839146 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 services: diff --git a/examples/openstack.yml b/examples/openstack.yml index d541425c4..eda03470c 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 095a20f6d..dafbb9764 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 0004146da..15a651782 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-equinixmetal.yml b/examples/platform-equinixmetal.yml index 8b72e2d7c..da1da3d7d 100644 --- a/examples/platform-equinixmetal.yml +++ b/examples/platform-equinixmetal.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index 911e5dc9a..dba0ef407 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index 3ef16b49b..b6187a9f9 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index c4782816e..cfd0ef9eb 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13-rt cmdline: "console=tty0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 8ee2ad78e..9943cdf6e 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index 400087cbc..6b493283f 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 0fd596f77..a553ad14b 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/redis-os.yml b/examples/redis-os.yml index be1a09447..c45f9370d 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index aed0ede05..4b16f6123 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 6ed7a0680..f673c159f 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/swap.yml b/examples/swap.yml index 5918f4334..2544dcf6e 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/tpm.yml b/examples/tpm.yml index b24d68b79..eeeece045 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/examples/volumes.yml b/examples/volumes.yml index 7ef2b1f11..4defe9ae0 100644 --- a/examples/volumes.yml +++ b/examples/volumes.yml @@ -3,9 +3,9 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:8a7b6cdb89197dc94eb6db69ef9dc90b750db598 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - - linuxkit/containerd:e7a92d9f3282039eac5fb1b07cac2b8664cbf0ad + - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index ddc67fec3..3a8c06fe7 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 06455445b..84365a5d7 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 4417d48a8..3d9059193 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/linuxkit.yml b/linuxkit.yml index 10b3607c3..968da2272 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 3d88f4900..4436e7adc 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -24,6 +24,9 @@ COPY --from=containerd-dev /go/src/github.com/containerd/containerd $GOPATH/src/ RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN go-compile.sh /go/src/cmd/service +# volumes link to start +RUN mkdir -p /etc/init.d && ln -s /usr/bin/service /etc/init.d/005-volumes + FROM linuxkit/alpine:146f540f25cd92ec8ff0c5b0c98342a9a95e479e AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl @@ -34,6 +37,7 @@ RUN mkdir -p /out/etc/ssl/certs # Remove cache residuals. We retain apk for SBOM tools RUN rm -rf /out/var/cache + FROM scratch ENTRYPOINT [] CMD [] @@ -42,5 +46,6 @@ COPY --from=build /go/bin/init / COPY --from=build /tmp/bin /bin/ COPY --from=build /go/bin/service /usr/bin/ COPY --from=build usermode-helper /sbin/ +COPY --from=build /etc/init.d/ /etc/init.d/ COPY --from=mirror /out/ / COPY etc etc/ diff --git a/pkg/init/cmd/service/cmd.go b/pkg/init/cmd/service/cmd.go index 0f95e9e4c..c146f62d7 100644 --- a/pkg/init/cmd/service/cmd.go +++ b/pkg/init/cmd/service/cmd.go @@ -25,7 +25,7 @@ func parseCmd(ctx context.Context, command string, args []string) (*log.Entry, s } sock := flags.String("sock", defaultSocket, "Path to containerd socket") - path := flags.String("path", defaultPath, "Path to service configs") + path := flags.String("path", defaultServicesPath, "Path to service configs") dumpSpec := flags.String("dump-spec", "", "Dump container spec to file before start") diff --git a/pkg/init/cmd/service/main.go b/pkg/init/cmd/service/main.go index 1c03e3e13..2fd0bfd2f 100644 --- a/pkg/init/cmd/service/main.go +++ b/pkg/init/cmd/service/main.go @@ -14,7 +14,8 @@ import ( const ( defaultSocket = "/run/containerd/containerd.sock" - defaultPath = "/containers/services" + defaultServicesPath = "/containers/services" + defaultVolumesPath = "/containers/volumes" defaultContainerd = "/usr/bin/containerd" installPath = "/usr/bin/service" onbootPath = "/containers/onboot" @@ -84,6 +85,8 @@ func main() { // check if called form startup scripts command := os.Args[0] switch { + case strings.Contains(command, "volumes"): + os.Exit(volumeInitCmd(ctx)) case strings.Contains(command, "onboot"): os.Exit(runcInit(onbootPath, "onboot")) case strings.Contains(command, "onshutdown"): diff --git a/pkg/init/cmd/service/system_init.go b/pkg/init/cmd/service/system_init.go index 3117fcc3e..4276a0510 100644 --- a/pkg/init/cmd/service/system_init.go +++ b/pkg/init/cmd/service/system_init.go @@ -67,7 +67,7 @@ func systemInitCmd(ctx context.Context, args []string) { } sock := flags.String("sock", defaultSocket, "Path to containerd socket") - path := flags.String("path", defaultPath, "Path to service configs") + path := flags.String("path", defaultServicesPath, "Path to service configs") binary := flags.String("containerd", defaultContainerd, "Path to containerd") if err := flags.Parse(args); err != nil { diff --git a/pkg/init/cmd/service/volumeinit.go b/pkg/init/cmd/service/volumeinit.go new file mode 100644 index 000000000..0b3de89e9 --- /dev/null +++ b/pkg/init/cmd/service/volumeinit.go @@ -0,0 +1,95 @@ +package main + +import ( + "context" + "flag" + "fmt" + "os" + "path/filepath" + + log "github.com/sirupsen/logrus" + "golang.org/x/sys/unix" +) + +func volumeInitCmd(ctx context.Context) int { + invoked := filepath.Base(os.Args[0]) + flags := flag.NewFlagSet("volume", flag.ExitOnError) + flags.Usage = func() { + fmt.Printf("USAGE: %s volume\n\n", invoked) + fmt.Printf("Options:\n") + flags.PrintDefaults() + } + + path := flags.String("path", defaultVolumesPath, "Path to volume configs") + + // Set up volumes + vols, err := os.ReadDir(*path) + // just skip if there is an error, eg no such path + if err != nil { + return 1 + } + // go through each volume, ensure that the volPath/merged exists as a directory, + // and is one of: + // - read-only: i.e. no tmp exists, merged bindmounted to lower + // - read-write: i.e. tmp exists, overlayfs lower/upper/merged + for _, vol := range vols { + subs, err := os.ReadDir(filepath.Join(*path, vol.Name())) + if err != nil { + log.WithError(err).Errorf("Error reading volume %s", vol.Name()) + return 1 + } + var hasLower, hasMerged, readWrite bool + for _, sub := range subs { + switch sub.Name() { + case "lower": + hasLower = true + case "tmp": + readWrite = true + case "merged": + hasMerged = true + } + } + if !hasMerged { + log.Errorf("Volume %s does not have a merged directory", vol.Name()) + return 1 + } + if !hasLower { + log.Errorf("Volume %s does not have a lower directory", vol.Name()) + return 1 + } + lowerDir := filepath.Join(*path, vol.Name(), "lower") + mergedDir := filepath.Join(*path, vol.Name(), "merged") + if !readWrite { + log.Infof("Volume %s is read-only, bind-mounting read-only", vol.Name()) + if err := unix.Mount(lowerDir, mergedDir, "bind", unix.MS_RDONLY, ""); err != nil { + log.WithError(err).Errorf("Error bind-mounting volume %s", vol.Name()) + return 1 + } + } else { + log.Infof("Volume %s is read-write, overlay mounting", vol.Name()) + // need a tmpfs to create the workdir and upper + tmpDir := filepath.Join(*path, vol.Name(), "tmp") + if err := unix.Mount("tmpfs", tmpDir, "tmpfs", unix.MS_RELATIME, ""); err != nil { + log.WithError(err).Errorf("Error creating tmpDir for volume %s", vol.Name()) + return 1 + } + workDir := filepath.Join(tmpDir, "work") + upperDir := filepath.Join(tmpDir, "upper") + if err := os.Mkdir(upperDir, 0755); err != nil { + log.WithError(err).Errorf("Error creating upper dir for volume %s", vol.Name()) + return 1 + } + if err := os.Mkdir(workDir, 0755); err != nil { + log.WithError(err).Errorf("Error creating work dir for volume %s", vol.Name()) + return 1 + } + // and let's mount the actual dir + data := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lowerDir, upperDir, workDir) + if err := unix.Mount("overlay", mergedDir, "overlay", unix.MS_RELATIME, data); err != nil { + log.WithError(err).Errorf("Error overlay-mounting volume %s", vol.Name()) + return 1 + } + } + } + return 0 +} diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 79147688c..cf14cc72d 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index d5e5c124d..bf0edf759 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index d0a3a0f10..e1ae0b537 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index ea279435b..768f3f7a7 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index 38e2cd206..088f3473d 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index c65a5a866..22592255c 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index f04919553..c81426675 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 14ed88977..cd1fa3239 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 1d8123445..98a5c802f 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,7 +2,7 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 9e5d6de4b..633e91fe2 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,7 +2,7 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/src/cmd/linuxkit/moby/build/mkimage.yaml b/src/cmd/linuxkit/moby/build/mkimage.yaml index 1611cb9c5..01118f9ee 100644 --- a/src/cmd/linuxkit/moby/build/mkimage.yaml +++ b/src/cmd/linuxkit/moby/build/mkimage.yaml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 0a417ee3d..418f6e064 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dhcpcd diff --git a/test/cases/000_build/001_tarheaders/test.yml b/test/cases/000_build/001_tarheaders/test.yml index 528cb2d08..5257be720 100644 --- a/test/cases/000_build/001_tarheaders/test.yml +++ b/test/cases/000_build/001_tarheaders/test.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 528cb2d08..5257be720 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index c8a31e2ea..39e8ab06c 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/test/cases/000_build/020_binds/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mount diff --git a/test/cases/000_build/050_sbom/test.yml b/test/cases/000_build/050_sbom/test.yml index 4105d41e3..4c0850ffd 100644 --- a/test/cases/000_build/050_sbom/test.yml +++ b/test/cases/000_build/050_sbom/test.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 diff --git a/test/cases/000_build/060_input_tar/000_build/test1.yml b/test/cases/000_build/060_input_tar/000_build/test1.yml index 38cc63aff..75df02aac 100644 --- a/test/cases/000_build/060_input_tar/000_build/test1.yml +++ b/test/cases/000_build/060_input_tar/000_build/test1.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/cases/000_build/060_input_tar/000_build/test2.yml b/test/cases/000_build/060_input_tar/000_build/test2.yml index 582d1b18e..e8710dfca 100644 --- a/test/cases/000_build/060_input_tar/000_build/test2.yml +++ b/test/cases/000_build/060_input_tar/000_build/test2.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/000_build/060_input_tar/010_same_filename/test.yml b/test/cases/000_build/060_input_tar/010_same_filename/test.yml index 38cc63aff..75df02aac 100644 --- a/test/cases/000_build/060_input_tar/010_same_filename/test.yml +++ b/test/cases/000_build/060_input_tar/010_same_filename/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 811a99c71..1404c6292 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 811a99c71..1404c6292 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 02efc5eb0..bfbf75b68 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 89f9e4667..4e7706550 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 89f9e4667..4e7706550 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 89f9e4667..4e7706550 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 89f9e4667..4e7706550 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 21deabfc3..03623a679 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 89f9e4667..4e7706550 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 89f9e4667..4e7706550 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index cde6d7592..46bbb6ad7 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 services: diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 89f9e4667..4e7706550 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index eef9d21e9..723e3e95e 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index 08f1d2000..afbce3ee7 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/test/cases/020_kernel/013_config_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/016_config_5.15.x/test.yml b/test/cases/020_kernel/016_config_5.15.x/test.yml index 15d702b73..df0f6e36c 100644 --- a/test/cases/020_kernel/016_config_5.15.x/test.yml +++ b/test/cases/020_kernel/016_config_5.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/019_config_6.6.x/test.yml b/test/cases/020_kernel/019_config_6.6.x/test.yml index 80af15993..652999ba8 100644 --- a/test/cases/020_kernel/019_config_6.6.x/test.yml +++ b/test/cases/020_kernel/019_config_6.6.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index f6d14a803..c4180406c 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.172-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.yml b/test/cases/020_kernel/113_kmod_5.10.x/test.yml index 2cf48cbba..9d67ec9f3 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.yml +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.104-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/116_kmod_5.15.x/test.yml b/test/cases/020_kernel/116_kmod_5.15.x/test.yml index 928b7ef82..0a3c4671e 100644 --- a/test/cases/020_kernel/116_kmod_5.15.x/test.yml +++ b/test/cases/020_kernel/116_kmod_5.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.15.27-9005a97e2b2cba68b4374092167b079a2874f66b cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/119_kmod_6.6.x/test.yml b/test/cases/020_kernel/119_kmod_6.6.x/test.yml index 23592279d..e8764d198 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/test.yml +++ b/test/cases/020_kernel/119_kmod_6.6.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index 5b2edd9cf..51ca84902 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index ec6f8e0f4..30c8aa259 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 9eb9b3b51..284d935a9 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 9eb9b3b51..284d935a9 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 7b825717a..45c1bac22 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 7b825717a..45c1bac22 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index e0c98acf4..6e69f089a 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index ad07a2999..a19023a6c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index 2ae3302ed..23b6942b5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index 2ae3302ed..23b6942b5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index b904461eb..1fce5f969 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index b904461eb..1fce5f969 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index bde7995d9..b38e67e55 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index 1fd87fd35..3c7302dae 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index e7faa3a44..76bc5c75f 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index e7faa3a44..76bc5c75f 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index 675eb8c64..f6bf8ba5a 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 675eb8c64..f6bf8ba5a 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index 2d92e4662..05a061652 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index 92c208947..4a59c1c5f 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index bd110e1b8..9399648ab 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index bd110e1b8..9399648ab 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index 2398805c8..e94c4b073 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index 2398805c8..e94c4b073 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 667cddb27..a936edf7a 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 79a998bf4..a4ed915da 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index ee8dc3eff..762531593 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index ee8dc3eff..762531593 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index 8b258e8ff..86d08c3cb 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index 8b258e8ff..86d08c3cb 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 58cfa6ef4..7b313fcab 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index afcb7f818..ede8066ff 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 3f1fd11e8..f53c07729 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 3f1fd11e8..f53c07729 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 293b135de..d580e0585 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 293b135de..d580e0585 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index 55a1e584c..0bd8d799c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index 5f7c0649c..0357e1802 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index 761657d20..d9c6156d2 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index 761657d20..d9c6156d2 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 23a7e0543..d79dfd478 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 23a7e0543..d79dfd478 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index 92b0bb402..e298faa15 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index c2d64ac35..1d2e5f45b 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index b95b6b48a..85991317e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index b95b6b48a..85991317e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index b51caaf6d..572842e0d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index b51caaf6d..572842e0d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index 85dd19c9b..d2bdf36a3 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml index b7c21e98d..ef5846ab7 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index 9221614e4..6d00d0874 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml index 9221614e4..6d00d0874 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index edc65b514..440027ef4 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml index edc65b514..440027ef4 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index c6a5d684c..76100209e 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml index 4d2e69b10..a9478b109 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index 2e4b060d4..458e4d456 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml index 2e4b060d4..458e4d456 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index cd59e0f52..d785fbaf7 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml index cd59e0f52..d785fbaf7 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml index b147e8913..cd0fe89d2 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml index b889bd554..be974ea64 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml index 81bf324df..0995f65bf 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml index 8db939829..639e8c9ab 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml index e217a9ef6..cd95195cd 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml index 87480641f..6fab0e0d8 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml index ab3fbd897..82d758fcb 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index cf955f064..4909c34d3 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,5 +2,5 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 439e33193..915f7132a 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index e486efe67..305ccf3a1 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/040_packages/001_dummy/test.yml b/test/cases/040_packages/001_dummy/test.yml index 687d5fce6..6139405bf 100644 --- a/test/cases/040_packages/001_dummy/test.yml +++ b/test/cases/040_packages/001_dummy/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dummy diff --git a/test/cases/040_packages/002_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml index 439186444..fc949e08c 100644 --- a/test/cases/040_packages/002_bcc/test.yml +++ b/test/cases/040_packages/002_bcc/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/kernel-bcc:5.4.113 onboot: diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index f67553ffc..1bcb7089a 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 90199c214..13a031515 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/bpftrace:d9ddf9095bce44197aadb0119fe963cb9ebc4444 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 1191cbdfa..68b65fe7a 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff onboot: diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml index 4b2ca3340..5279b3908 100644 --- a/test/cases/040_packages/003_cgroupv2/test.yml +++ b/test/cases/040_packages/003_cgroupv2/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index c26235b25..7b80d5bc4 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 49259dab2..67d6ae9f5 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dhcpcd diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 74605cad0..d2db59ab0 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 59e05bcf5..905d58be5 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index bba3f431c..d5f3e923f 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: dm-crypt diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 3d9e91d0c..e4f2b0c83 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 08927a410..2a32f2ed6 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index ecaa19da4..50b8f2df4 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 7a51705c0..7d808a444 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index e3e9a97e0..d70da0c06 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 4d4cfc87b..42c261248 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 1c1804019..9f5bda123 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index 08927a410..2a32f2ed6 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: extend diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 559286438..3cf64cad5 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index dd5a9367a..084ff8601 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 1d1a0b508..d3970261b 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 9dbc4a9b2..cad81cdf3 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: modprobe diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 4633e2594..17a76131d 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index a7b400508..90a18591f 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index ff2ac2719..94f72e846 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index d49be4a5f..a1c85767c 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: format diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 6a13d29ba..935253588 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/009_init_containerd/test.yml b/test/cases/040_packages/009_init_containerd/test.yml index b987909be..f17c87057 100644 --- a/test/cases/040_packages/009_init_containerd/test.yml +++ b/test/cases/040_packages/009_init_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/011_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml index cc69d4b53..5686e009e 100644 --- a/test/cases/040_packages/011_kmsg/test.yml +++ b/test/cases/040_packages/011_kmsg/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/012_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml index e3b1de288..46b7452bc 100644 --- a/test/cases/040_packages/012_logwrite/test.yml +++ b/test/cases/040_packages/012_logwrite/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index ea9e301eb..fb5379645 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: losetup diff --git a/test/cases/040_packages/013_metadata/000_cidata/test.yml b/test/cases/040_packages/013_metadata/000_cidata/test.yml index f6463cac4..c4388d269 100644 --- a/test/cases/040_packages/013_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/013_metadata/000_cidata/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: metadata diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 9d6f4e534..47c2f2f90 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 01bdbc7aa..6fc112325 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 1cc7aa565..2d533f8f6 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 50b19c8e3..97d6dee02 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 - linuxkit/ca-certificates:5aaa343474e5ac3ac01f8b917e82efb1063d80ff diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index ba8630a03..0801a0c9b 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index dc285b190..12c63adca 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f - linuxkit/containerd:39301e7312f13eedf19bd5d5551af7b37001d435 onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 545a7674e..741ac0d15 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,11 +3,11 @@ kernel: image: linuxkit/kernel:6.6.13 cmdline: "console=ttyS0" init: - - linuxkit/init:59b5282b07b782091de8915ac30b512a227f72f9 + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f onboot: - name: test-ns - image: linuxkit/test-ns:30e09616e860351c3b94c2de5580475cf6779a1d + image: linuxkit/test-ns:4e24ffee622aba97d571ff240fb9051f22fd71ac-dirty-3c1c31f command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] # command: ["/bin/sh", "/runc-net.sh", "-l", "5", "-i", "2", "-c", "5", "-p", "unix", "-ip", "6"] mounts: # for runc From 38a0cb6376f3ff61218c0528fc7e1960c357b4f2 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Sun, 21 Jul 2024 12:20:53 +0300 Subject: [PATCH 3/3] test cases for volumes Signed-off-by: Avi Deitcher --- .../070_volumes/000_rw_on_rw/check.sh | 15 ++++++++ .../070_volumes/000_rw_on_rw/test.sh | 26 +++++++++++++ .../070_volumes/000_rw_on_rw/test.yml | 31 +++++++++++++++ .../070_volumes/000_rw_on_rw/write.sh | 5 +++ .../070_volumes/001_ro_on_ro/check.sh | 15 ++++++++ .../070_volumes/001_ro_on_ro/test.sh | 26 +++++++++++++ .../070_volumes/001_ro_on_ro/test.yml | 23 +++++++++++ .../070_volumes/002_rw_on_ro/check.sh | 15 ++++++++ .../070_volumes/002_rw_on_ro/test.sh | 29 ++++++++++++++ .../070_volumes/002_rw_on_ro/test.yml | 23 +++++++++++ .../070_volumes/003_ro_on_rw/check.sh | 14 +++++++ .../070_volumes/003_ro_on_rw/test.sh | 26 +++++++++++++ .../070_volumes/003_ro_on_rw/test.yml | 28 ++++++++++++++ .../070_volumes/003_ro_on_rw/write.sh | 15 ++++++++ .../000_build/070_volumes/004_blank/check.sh | 16 ++++++++ .../000_build/070_volumes/004_blank/test.sh | 26 +++++++++++++ .../000_build/070_volumes/004_blank/test.yml | 22 +++++++++++ .../000_build/070_volumes/005_image/check.sh | 17 +++++++++ .../000_build/070_volumes/005_image/test.sh | 26 +++++++++++++ .../000_build/070_volumes/005_image/test.yml | 23 +++++++++++ .../070_volumes/006_mount_types/check.sh | 17 +++++++++ .../070_volumes/006_mount_types/test.sh | 26 +++++++++++++ .../070_volumes/006_mount_types/test.yml | 38 +++++++++++++++++++ 23 files changed, 502 insertions(+) create mode 100755 test/cases/000_build/070_volumes/000_rw_on_rw/check.sh create mode 100755 test/cases/000_build/070_volumes/000_rw_on_rw/test.sh create mode 100644 test/cases/000_build/070_volumes/000_rw_on_rw/test.yml create mode 100755 test/cases/000_build/070_volumes/000_rw_on_rw/write.sh create mode 100755 test/cases/000_build/070_volumes/001_ro_on_ro/check.sh create mode 100755 test/cases/000_build/070_volumes/001_ro_on_ro/test.sh create mode 100644 test/cases/000_build/070_volumes/001_ro_on_ro/test.yml create mode 100755 test/cases/000_build/070_volumes/002_rw_on_ro/check.sh create mode 100755 test/cases/000_build/070_volumes/002_rw_on_ro/test.sh create mode 100644 test/cases/000_build/070_volumes/002_rw_on_ro/test.yml create mode 100755 test/cases/000_build/070_volumes/003_ro_on_rw/check.sh create mode 100755 test/cases/000_build/070_volumes/003_ro_on_rw/test.sh create mode 100644 test/cases/000_build/070_volumes/003_ro_on_rw/test.yml create mode 100755 test/cases/000_build/070_volumes/003_ro_on_rw/write.sh create mode 100755 test/cases/000_build/070_volumes/004_blank/check.sh create mode 100755 test/cases/000_build/070_volumes/004_blank/test.sh create mode 100644 test/cases/000_build/070_volumes/004_blank/test.yml create mode 100755 test/cases/000_build/070_volumes/005_image/check.sh create mode 100755 test/cases/000_build/070_volumes/005_image/test.sh create mode 100644 test/cases/000_build/070_volumes/005_image/test.yml create mode 100755 test/cases/000_build/070_volumes/006_mount_types/check.sh create mode 100755 test/cases/000_build/070_volumes/006_mount_types/test.sh create mode 100644 test/cases/000_build/070_volumes/006_mount_types/test.yml diff --git a/test/cases/000_build/070_volumes/000_rw_on_rw/check.sh b/test/cases/000_build/070_volumes/000_rw_on_rw/check.sh new file mode 100755 index 000000000..a81383d46 --- /dev/null +++ b/test/cases/000_build/070_volumes/000_rw_on_rw/check.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -x + +function failed { + printf "rw_on_rw test suite FAILED\n" >&1 + exit 1 +} + +# check that the files we created are there and have the contents + +[ -d /vola ] || failed +[ -e /vola/mytestfile ] || failed +[ "$(cat /vola/mytestfile)" == "file" ] || failed +printf "rw_on_rw test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/000_rw_on_rw/test.sh b/test/cases/000_build/070_volumes/000_rw_on_rw/test.sh new file mode 100755 index 000000000..8605832d3 --- /dev/null +++ b/test/cases/000_build/070_volumes/000_rw_on_rw/test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# SUMMARY: Check that writing to a volume makes it visible +# LABELS: +# REPEAT: + +set -ex + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=volume_rw_on_rw + +clean_up() { + rm -rf ${NAME}-* ${DISK} +} +trap clean_up EXIT + +# Test code goes here + +linuxkit build --format kernel+initrd --name ${NAME} test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml b/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml new file mode 100644 index 000000000..f13600035 --- /dev/null +++ b/test/cases/000_build/070_volumes/000_rw_on_rw/test.yml @@ -0,0 +1,31 @@ +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f +onboot: + - name: test1 + image: alpine:3.20 + binds: + - /write.sh:/write.sh + - vola:/vola + command: ["sh", "-c", "/write.sh"] + - name: test2 + image: alpine:3.20 + binds: + - /check.sh:/check.sh + - vola:/vola + command: ["sh", "-c", "/check.sh"] + - name: poweroff + image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 + command: ["/bin/sh", "/poweroff.sh", "10"] +volumes: + - name: vola +files: + - path: check.sh + source: ./check.sh + mode: "0700" + - path: write.sh + source: ./write.sh + mode: "0700" diff --git a/test/cases/000_build/070_volumes/000_rw_on_rw/write.sh b/test/cases/000_build/070_volumes/000_rw_on_rw/write.sh new file mode 100755 index 000000000..73017fbb8 --- /dev/null +++ b/test/cases/000_build/070_volumes/000_rw_on_rw/write.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -x + +echo -n "file" > /vola/mytestfile diff --git a/test/cases/000_build/070_volumes/001_ro_on_ro/check.sh b/test/cases/000_build/070_volumes/001_ro_on_ro/check.sh new file mode 100755 index 000000000..6e809228e --- /dev/null +++ b/test/cases/000_build/070_volumes/001_ro_on_ro/check.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -x + +function failed { + printf "ro_on_ro test suite FAILED\n" >&1 + exit 1 +} + +# this should fail as it is read-only +echo -n "file" > /vola/mytestfile || true + +[ -e /vola/mytestfile ] && failed + +printf "ro_on_ro test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/001_ro_on_ro/test.sh b/test/cases/000_build/070_volumes/001_ro_on_ro/test.sh new file mode 100755 index 000000000..8fbb4c99b --- /dev/null +++ b/test/cases/000_build/070_volumes/001_ro_on_ro/test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# SUMMARY: Check that writing to a volume makes it visible +# LABELS: +# REPEAT: + +set -ex + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=volume_ro_on_ro + +clean_up() { + rm -rf ${NAME}-* ${DISK} +} +trap clean_up EXIT + +# Test code goes here + +linuxkit build --format kernel+initrd --name ${NAME} test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml b/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml new file mode 100644 index 000000000..f311d187d --- /dev/null +++ b/test/cases/000_build/070_volumes/001_ro_on_ro/test.yml @@ -0,0 +1,23 @@ +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f +onboot: + - name: test + image: alpine:3.20 + binds: + - /check.sh:/check.sh + - vola:/vola:ro + command: ["sh", "-c", "/check.sh"] + - name: poweroff + image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 + command: ["/bin/sh", "/poweroff.sh", "10"] +volumes: + - name: vola + readonly: true +files: + - path: check.sh + source: ./check.sh + mode: "0700" diff --git a/test/cases/000_build/070_volumes/002_rw_on_ro/check.sh b/test/cases/000_build/070_volumes/002_rw_on_ro/check.sh new file mode 100755 index 000000000..4e5a4f43a --- /dev/null +++ b/test/cases/000_build/070_volumes/002_rw_on_ro/check.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -x + +function failed { + printf "rw_on_ro test suite FAILED\n" >&1 + exit 1 +} + +# this should fail as it is read-only +echo -n "file" > /vola/mytestfile || true + +[ -e /vola/mytestfile ] && failed + +printf "rw_on_ro test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/002_rw_on_ro/test.sh b/test/cases/000_build/070_volumes/002_rw_on_ro/test.sh new file mode 100755 index 000000000..b860be2dc --- /dev/null +++ b/test/cases/000_build/070_volumes/002_rw_on_ro/test.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# SUMMARY: Check that writing to a volume makes it visible +# LABELS: +# REPEAT: + +set -ex + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=volume_rw_on_r0 + +clean_up() { + rm -rf ${NAME}-* ${DISK} +} +trap clean_up EXIT + +# Test code goes here + +set +e +linuxkit build --format kernel+initrd --name ${NAME} test.yml +retcode=$? +set -e + +# the build should fail, as we have are mounting a read-only volume as read-write in a container +if [ $retcode -eq 0 ]; then + exit 1 +fi diff --git a/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml b/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml new file mode 100644 index 000000000..3374a4a45 --- /dev/null +++ b/test/cases/000_build/070_volumes/002_rw_on_ro/test.yml @@ -0,0 +1,23 @@ +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f +onboot: + - name: test + image: alpine:3.20 + binds: + - /check.sh:/check.sh + - vola:/vola + command: ["sh", "-c", "/check.sh"] + - name: poweroff + image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 + command: ["/bin/sh", "/poweroff.sh", "10"] +volumes: + - name: vola + readonly: true +files: + - path: check.sh + source: ./check.sh + mode: "0700" diff --git a/test/cases/000_build/070_volumes/003_ro_on_rw/check.sh b/test/cases/000_build/070_volumes/003_ro_on_rw/check.sh new file mode 100755 index 000000000..99cc14028 --- /dev/null +++ b/test/cases/000_build/070_volumes/003_ro_on_rw/check.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -x + +function failed { + printf "ro_on_rw test suite FAILED\n" >&1 + exit 1 +} + +# the file should not exist, as it was mounted read-only + +[ -d /vola ] || failed +[ -e /vola/mytestfile ] && failed +printf "ro_on_rw test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/003_ro_on_rw/test.sh b/test/cases/000_build/070_volumes/003_ro_on_rw/test.sh new file mode 100755 index 000000000..a1a5bd856 --- /dev/null +++ b/test/cases/000_build/070_volumes/003_ro_on_rw/test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# SUMMARY: Check that writing to a volume makes it visible +# LABELS: +# REPEAT: + +set -ex + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=volume_ro_on_rw + +clean_up() { + rm -rf ${NAME}-* ${DISK} +} +trap clean_up EXIT + +# Test code goes here + +linuxkit build --format kernel+initrd --name ${NAME} test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml b/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml new file mode 100644 index 000000000..e1d60c434 --- /dev/null +++ b/test/cases/000_build/070_volumes/003_ro_on_rw/test.yml @@ -0,0 +1,28 @@ +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f +onboot: + - name: test1 + image: alpine:3.20 + binds: + - /write.sh:/write.sh + - vola:/vola:ro + command: ["sh", "-c", "/write.sh"] + - name: test2 + image: alpine:3.20 + binds: + - /check.sh:/check.sh + - vola:/vola:ro + command: ["sh", "-c", "/check.sh"] + - name: poweroff + image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 + command: ["/bin/sh", "/poweroff.sh", "10"] +volumes: + - name: vola +files: + - path: check.sh + source: ./check.sh + mode: "0700" diff --git a/test/cases/000_build/070_volumes/003_ro_on_rw/write.sh b/test/cases/000_build/070_volumes/003_ro_on_rw/write.sh new file mode 100755 index 000000000..6e809228e --- /dev/null +++ b/test/cases/000_build/070_volumes/003_ro_on_rw/write.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +set -x + +function failed { + printf "ro_on_ro test suite FAILED\n" >&1 + exit 1 +} + +# this should fail as it is read-only +echo -n "file" > /vola/mytestfile || true + +[ -e /vola/mytestfile ] && failed + +printf "ro_on_ro test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/004_blank/check.sh b/test/cases/000_build/070_volumes/004_blank/check.sh new file mode 100755 index 000000000..b43601ce5 --- /dev/null +++ b/test/cases/000_build/070_volumes/004_blank/check.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -x + +function failed { + printf "blank volume test suite FAILED\n" >&1 + exit 1 +} + +# check that no files exist + +[ -d /vola ] || failed + +contents=$(ls -A /vola) +[ -z "$contents" ] || failed +printf "blank volume test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/004_blank/test.sh b/test/cases/000_build/070_volumes/004_blank/test.sh new file mode 100755 index 000000000..1f070b3e1 --- /dev/null +++ b/test/cases/000_build/070_volumes/004_blank/test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# SUMMARY: Check that writing to a volume makes it visible +# LABELS: +# REPEAT: + +set -ex + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=volume_blank + +clean_up() { + rm -rf ${NAME}-* ${DISK} +} +trap clean_up EXIT + +# Test code goes here + +linuxkit build --format kernel+initrd --name ${NAME} test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/000_build/070_volumes/004_blank/test.yml b/test/cases/000_build/070_volumes/004_blank/test.yml new file mode 100644 index 000000000..cde65bcb4 --- /dev/null +++ b/test/cases/000_build/070_volumes/004_blank/test.yml @@ -0,0 +1,22 @@ +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f +onboot: + - name: test + image: alpine:3.20 + binds: + - /check.sh:/check.sh + - vola:/vola + command: ["sh", "-c", "/check.sh"] + - name: poweroff + image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 + command: ["/bin/sh", "/poweroff.sh", "10"] +volumes: + - name: vola +files: + - path: check.sh + source: ./check.sh + mode: "0700" diff --git a/test/cases/000_build/070_volumes/005_image/check.sh b/test/cases/000_build/070_volumes/005_image/check.sh new file mode 100755 index 000000000..3e08dcc53 --- /dev/null +++ b/test/cases/000_build/070_volumes/005_image/check.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +set -x + +function failed { + printf "blank volume test suite FAILED\n" >&1 + exit 1 +} + +# check that no files exist + +[ -d /vola ] || failed + +contents=$(ls -A /vola) +[ -n "$contents" ] || failed +[ -e "/vola/bin/busybox" ] || failed +printf "blank volume test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/005_image/test.sh b/test/cases/000_build/070_volumes/005_image/test.sh new file mode 100755 index 000000000..099dc33be --- /dev/null +++ b/test/cases/000_build/070_volumes/005_image/test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# SUMMARY: Check that writing to a volume makes it visible +# LABELS: +# REPEAT: + +set -ex + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=volume_image + +clean_up() { + rm -rf ${NAME}-* ${DISK} +} +trap clean_up EXIT + +# Test code goes here + +linuxkit build --format kernel+initrd --name ${NAME} test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/000_build/070_volumes/005_image/test.yml b/test/cases/000_build/070_volumes/005_image/test.yml new file mode 100644 index 000000000..7b0aaf7de --- /dev/null +++ b/test/cases/000_build/070_volumes/005_image/test.yml @@ -0,0 +1,23 @@ +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f +onboot: + - name: test + image: alpine:3.20 + binds: + - /check.sh:/check.sh + - vola:/vola + command: ["sh", "-c", "/check.sh"] + - name: poweroff + image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 + command: ["/bin/sh", "/poweroff.sh", "10"] +volumes: + - name: vola + image: alpine:3.19 +files: + - path: check.sh + source: ./check.sh + mode: "0700" diff --git a/test/cases/000_build/070_volumes/006_mount_types/check.sh b/test/cases/000_build/070_volumes/006_mount_types/check.sh new file mode 100755 index 000000000..3e08dcc53 --- /dev/null +++ b/test/cases/000_build/070_volumes/006_mount_types/check.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +set -x + +function failed { + printf "blank volume test suite FAILED\n" >&1 + exit 1 +} + +# check that no files exist + +[ -d /vola ] || failed + +contents=$(ls -A /vola) +[ -n "$contents" ] || failed +[ -e "/vola/bin/busybox" ] || failed +printf "blank volume test suite PASSED\n" >&1 diff --git a/test/cases/000_build/070_volumes/006_mount_types/test.sh b/test/cases/000_build/070_volumes/006_mount_types/test.sh new file mode 100755 index 000000000..7bc5c5f34 --- /dev/null +++ b/test/cases/000_build/070_volumes/006_mount_types/test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# SUMMARY: Check that writing to a volume makes it visible +# LABELS: +# REPEAT: + +set -ex + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=volume_mount_types + +clean_up() { + rm -rf ${NAME}-* ${DISK} +} +trap clean_up EXIT + +# Test code goes here + +linuxkit build --format kernel+initrd --name ${NAME} test.yml +RESULT="$(linuxkit run ${NAME})" +echo "${RESULT}" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/000_build/070_volumes/006_mount_types/test.yml b/test/cases/000_build/070_volumes/006_mount_types/test.yml new file mode 100644 index 000000000..311ac554d --- /dev/null +++ b/test/cases/000_build/070_volumes/006_mount_types/test.yml @@ -0,0 +1,38 @@ +kernel: + image: linuxkit/kernel:6.6.13 + cmdline: "console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:872d2e1be745f1acb948762562cf31c367303a3b + - linuxkit/runc:6062483d748609d505f2bcde4e52ee64a3329f5f +onboot: + - name: testbinds + image: alpine:3.20 + binds: + - /check.sh:/check.sh + - vola:/vola + command: ["sh", "-c", "/check.sh"] + - name: testmounts + image: alpine:3.20 + binds: + - /check.sh:/check.sh + mounts: + - type: bind + source: vola + destination: /vola + command: ["sh", "-c", "/check.sh"] + - name: testbindadds + image: alpine:3.20 + binds.add: + - /check.sh:/check.sh + - vola:/vola + command: ["sh", "-c", "/check.sh"] + - name: poweroff + image: linuxkit/poweroff:401dc53c604c0b2179ed0369a6968fd4179cc176 + command: ["/bin/sh", "/poweroff.sh", "10"] +volumes: + - name: vola + image: alpine:3.19 +files: + - path: check.sh + source: ./check.sh + mode: "0700"