From 7fe24e6d41f0a529a0e60a2035c4135f32f3c837 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Sat, 29 Jan 2022 13:17:47 -0600
Subject: [PATCH] pkg/runc: Revert to 1.0.0-rc90

This commit reverts runc to version 1.0.0-rc90 which is the last known
version to not have any degraded functionality with linuxkit.  The
first known broken version is 1.0.0-rc91, and a bisect between these
two bounds shows the breakage first appearing at
60e21ec26e15945259d4b1e790e8fd119ee86467.  As I don't have the time
nor knowledge to debug this further, my best suggestion I can offer is
to revert to the most recent version that worked.

Signed-off-by: Michael Aldridge <aldridge.mac@gmail.com>
---
 pkg/runc/Dockerfile                          |  2 +-
 test/cases/040_packages/004_dockerd/test.yml | 44 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 test/cases/040_packages/004_dockerd/test.yml

diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile
index 9ba5d7144d..e79fbe60f4 100644
--- a/pkg/runc/Dockerfile
+++ b/pkg/runc/Dockerfile
@@ -12,7 +12,7 @@ RUN \
   make \
   && true
 ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off
-ENV RUNC_COMMIT=v1.0.3
+ENV RUNC_COMMIT=v1.0.0-rc90
 RUN mkdir -p $GOPATH/src/github.com/opencontainers && \
   cd $GOPATH/src/github.com/opencontainers && \
   git clone https://github.com/opencontainers/runc.git
diff --git a/test/cases/040_packages/004_dockerd/test.yml b/test/cases/040_packages/004_dockerd/test.yml
new file mode 100644
index 0000000000..c9e0a5367f
--- /dev/null
+++ b/test/cases/040_packages/004_dockerd/test.yml
@@ -0,0 +1,44 @@
+kernel:
+  image: linuxkit/kernel:5.10.92
+  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
+init:
+  - linuxkit/init:7e3d51e6ab5896ecb36a4829450f7430f2878927
+  - linuxkit/runc:9f7aad4eb5e4360cc9ed8778a5c501cce6e21601
+  - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e
+  - linuxkit/ca-certificates:c1c73ef590dffb6a0138cf758fe4a4305c9864f4
+onboot:
+  - name: sysctl
+    image: linuxkit/sysctl:bdc99eeedc224439ff237990ee06e5b992c8c1ae
+  - name: sysfs
+    image: linuxkit/sysfs:c3bdb00c5e23bf566d294bafd5f7890ca319056f
+  - name: format
+    image: linuxkit/format:7efa07559dd23cb4dbebfd3ab48c50fd33625918
+  - name: mount
+    image: linuxkit/mount:422b219bb1c7051096126ac83e6dcc8b2f3f1176
+    command: ["/usr/bin/mountie", "/var/lib/docker"]
+services:
+  - name: getty
+    image: linuxkit/getty:3c6e89681a988c3d4e2610fcd7aaaa0247ded3ec
+    env:
+     - INSECURE=true
+  - name: dhcpcd
+    image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
+  - name: docker
+    image: docker:20.10.6-dind
+    capabilities:
+     - all
+    net: host
+    mounts:
+     - type: cgroup
+       options: ["rw","nosuid","noexec","nodev","relatime"]
+    binds:
+     - /etc/resolv.conf:/etc/resolv.conf
+     - /var/lib/docker:/var/lib/docker
+     - /lib/modules:/lib/modules
+     - /etc/docker/daemon.json:/etc/docker/daemon.json
+    command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
+files:
+  - path: var/lib/docker
+    directory: true
+  - path: etc/docker/daemon.json
+    contents: '{"debug": true}'