Merge pull request #5036 from thaJeztah/split_runc_binary

Separate runc binary version from libcontainer version, and remove obsolete build-tags

contrib/Dockerfile.test

@@ -5,6 +5,10 @@
 # 2.) docker run -it --privileged -v /tmp:/tmp --tmpfs /var/lib/containerd-test containerd-test  bash
 # 3.) $ make binaries install test
 #
+# Use the RUNC_VERSION build-arg to build with a custom version of runc, for example,
+# to build runc v1.0.0-rc93, use:
+#
+# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../
 
 ARG GOLANG_VERSION=1.16.1
 
@@ -32,8 +36,9 @@ RUN apt-get update && apt-get install -y \
     libseccomp-dev \
   --no-install-recommends
 
-COPY go.mod go.mod
-COPY script/setup/install-runc install-runc
+COPY script/setup/runc-version script/setup/install-runc ./
+# Allow overriding the version of runc to install through build-args
+ARG RUNC_VERSION
 ARG GOPROXY=direct
 RUN ./install-runc