fix parseDevices import

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

.github/workflows/test.yml

@@ -322,37 +322,37 @@ jobs:
       - name: "build"
         run: GO_VERSION="$(echo ${{ matrix.go-version }} | sed -e s/.x//)" make binaries
 
-  # test-integration-docker-compatibility:
-  #   timeout-minutes: 30
-  #   name: docker
-  #   runs-on: ubuntu-24.04
-  #   steps:
-  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
-  #       with:
-  #         fetch-depth: 1
-  #     - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a  # v5.2.0
-  #       with:
-  #         go-version: ${{ env.GO_VERSION }}
-  #         check-latest: true
-  #     - name: "Register QEMU (tonistiigi/binfmt)"
-  #       run: |
-  #         # `--install all` will only install emulation for architectures that cannot be natively executed
-  #         # Since some arm64 platforms do provide native fallback execution for 32 bits,
-  #         # armv7 emulation may or may not be installed, causing variance in the result of `uname -m`.
-  #         # To avoid that, we explicitly list the architectures we do want emulation for.
-  #         docker run --privileged --rm tonistiigi/binfmt --install linux/amd64
-  #         docker run --privileged --rm tonistiigi/binfmt --install linux/arm64
-  #         docker run --privileged --rm tonistiigi/binfmt --install linux/arm/v7
-  #     - name: "Prepare integration test environment"
-  #       run: |
-  #         sudo apt-get install -y expect
-  #         go install -v gotest.tools/gotestsum@v1
-  #     - name: "Ensure that the integration test suite is compatible with Docker"
-  #       run: WITH_SUDO=true ./hack/test-integration.sh -test.target=docker
-  #     - name: "Ensure that the IPv6 integration test suite is compatible with Docker"
-  #       run: WITH_SUDO=true ./hack/test-integration.sh -test.target=docker -test.only-ipv6
-  #     - name: "Ensure that the integration test suite is compatible with Docker (flaky only)"
-  #       run: WITH_SUDO=true ./hack/test-integration.sh -test.target=docker -test.only-flaky
+  test-integration-docker-compatibility:
+    timeout-minutes: 30
+    name: docker
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a  # v5.2.0
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          check-latest: true
+      - name: "Register QEMU (tonistiigi/binfmt)"
+        run: |
+          # `--install all` will only install emulation for architectures that cannot be natively executed
+          # Since some arm64 platforms do provide native fallback execution for 32 bits,
+          # armv7 emulation may or may not be installed, causing variance in the result of `uname -m`.
+          # To avoid that, we explicitly list the architectures we do want emulation for.
+          docker run --privileged --rm tonistiigi/binfmt --install linux/amd64
+          docker run --privileged --rm tonistiigi/binfmt --install linux/arm64
+          docker run --privileged --rm tonistiigi/binfmt --install linux/arm/v7
+      - name: "Prepare integration test environment"
+        run: |
+          sudo apt-get install -y expect
+          go install -v gotest.tools/gotestsum@v1
+      - name: "Ensure that the integration test suite is compatible with Docker"
+        run: WITH_SUDO=true ./hack/test-integration.sh -test.target=docker
+      - name: "Ensure that the IPv6 integration test suite is compatible with Docker"
+        run: WITH_SUDO=true ./hack/test-integration.sh -test.target=docker -test.only-ipv6
+      - name: "Ensure that the integration test suite is compatible with Docker (flaky only)"
+        run: WITH_SUDO=true ./hack/test-integration.sh -test.target=docker -test.only-flaky
 
   test-integration-windows:
     timeout-minutes: 30

cmd/nerdctl/container/container_inspect_linux_test.go

@@ -363,15 +363,15 @@ func TestContainerInspectHostConfigPID(t *testing.T) {
 	// Run the first container
 	base.Cmd("run", "-d", "--name", testContainer1, testutil.AlpineImage, "sleep", "infinity").AssertOK()
 
-	container1_ID := strings.TrimSpace(base.Cmd("inspect", "-f", "{{.Id}}", testContainer1).Out())
+	containerId1 := strings.TrimSpace(base.Cmd("inspect", "-f", "{{.Id}}", testContainer1).Out())
 
 	base.Cmd("run", "-d", "--name", testContainer2,
 		"--pid", fmt.Sprintf("container:%s", testContainer1),
 		testutil.AlpineImage, "sleep", "infinity").AssertOK()
 
 	inspect := base.InspectContainer(testContainer2)
 
-	assert.Equal(t, fmt.Sprintf("container:%s", container1_ID), inspect.HostConfig.PidMode)
+	assert.Equal(t, fmt.Sprintf("container:%s", containerId1), inspect.HostConfig.PidMode)
 
 }
 

pkg/cmd/container/create.go

@@ -663,7 +663,7 @@ type internalLabels struct {
 	groupAdd []string
 
 	// label for device mapping set by the --device flag
-	deviceMapping []string
+	deviceMapping []dockercompat.DeviceMapping
 }
 
 // WithInternalLabels sets the internal labels for a container.
@@ -773,18 +773,7 @@ func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerO
 	}
 
 	if len(internalLabels.deviceMapping) > 0 {
-		for i := range internalLabels.deviceMapping {
-			var deviceMapping dockercompat.DeviceMapping
-			device := internalLabels.deviceMapping[i]
-			devPath, conPath, mode, err := ParseDevice(device)
-			if err != nil {
-				return nil, err
-			}
-			deviceMapping.CgroupPermissions = mode
-			deviceMapping.PathInContainer = conPath
-			deviceMapping.PathOnHost = devPath
-			hostConfigLabel.Devices = append(hostConfigLabel.Devices, deviceMapping)
-		}
+		hostConfigLabel.Devices = append(hostConfigLabel.Devices, internalLabels.deviceMapping...)
 	}
 
 	hostConfigJSON, err := json.Marshal(hostConfigLabel)

pkg/cmd/container/run_cgroup_linux.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/infoutil"
+	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 )
 
@@ -206,7 +207,11 @@ func generateCgroupOpts(id string, options types.ContainerCreateOptions, interna
 			return nil, fmt.Errorf("failed to parse device %q: %w", f, err)
 		}
 		opts = append(opts, oci.WithDevices(devPath, conPath, mode))
-		internalLabels.deviceMapping = append(internalLabels.deviceMapping, f)
+		var deviceMap dockercompat.DeviceMapping
+		deviceMap.PathOnHost = devPath
+		deviceMap.PathInContainer = conPath
+		deviceMap.CgroupPermissions = mode
+		internalLabels.deviceMapping = append(internalLabels.deviceMapping, deviceMap)
 	}
 
 	return opts, nil