Add support to nerdctl

Author: vtm9

k8s/Makefile

@@ -8,7 +8,7 @@ kb-get-pods:
 	kubectl get pod -w -o wide
 
 kb-get-nodes:
-	kubectl get nodes
+	kubectl get nodes -o wide
 
 kb-get-services:
 	kubectl get services

k8s/app-chart/templates/runner_deployment.yaml

@@ -24,6 +24,9 @@ spec:
         - name: docker-sock
           hostPath:
             path: /var/run/docker.sock
+        - name: containerd-sock
+          hostPath:
+            path: /run/containerd/containerd.sock
       containers:
         - name: runner
           securityContext:
@@ -47,6 +50,8 @@ spec:
               name: users-code-path
             - mountPath: /var/run/docker.sock
               name: docker-sock
+            - mountPath: /run/containerd/containerd.sock
+              name: containerd-sock
           envFrom:
             - secretRef:
                 name: codebattle-secrets

services/app/Dockerfile.runner

@@ -28,15 +28,17 @@ FROM elixir:1.18-alpine AS runtime-image
 
 ENV DOCKER_CHANNEL stable
 ENV DOCKER_VERSION 24.0.9
-
+ENV NERDCTL_VERSION 2.1.3
 ENV GOON_VERSION v1.1.1
 
-
 RUN apk update && apk add --no-cache ca-certificates git make curl vim
 
 RUN curl -fsSL "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/x86_64/docker-${DOCKER_VERSION}.tgz" \
   | tar -xzC /usr/local/bin --strip=1 docker/docker
 
+RUN curl -sL "https://github.com/containerd/nerdctl/releases/download/v${NERDCTL_VERSION}/nerdctl-${NERDCTL_VERSION}-linux-amd64.tar.gz" \
+  | tar -xz -C /usr/local/bin/
+
 RUN curl -fsSL "https://github.com/alco/goon/releases/download/${GOON_VERSION}/goon_linux_amd64.tar.gz" \
   | tar -xzC /usr/local/bin
 

services/app/apps/runner/lib/mix/tasks/dockers/pull.ex

@@ -20,7 +20,10 @@ defmodule Mix.Tasks.Dockers.Pull do
 
   defp pull(meta) do
     IO.puts("Start pulling image for #{meta.slug}")
-    result = Porcelain.shell("docker pull #{meta.docker_image}", err: :string)
+
+    cmd = "#{Application.get_env(:runner, :container_runtime)} pull #{meta.docker_image}"
+    result = Porcelain.shell(cmd, err: :string)
+
     IO.puts(result.out)
   end
 end

services/app/apps/runner/lib/runner/executor.ex

@@ -8,6 +8,8 @@ defmodule Runner.Executor do
 
   @tmp_basedir "/tmp/codebattle-runner"
   @docker_cmd_template "docker run --rm --init --memory 600m --cpus=2 --net none -l codebattle_game ~s ~s timeout -s KILL ~s make --silent test"
+  @nerdctl_cmd_template "nerdctl run --rm --runtime=io.containerd.runc.v2 --memory 600m --cpus=2 --net none -l codebattle_game ~s ~s timeout -s KILL ~s make --silent test"
+
   @fake_docker_run Application.compile_env(:runner, :fake_docker_run, false)
 
   @spec call(Runner.Task.t(), Runner.LanguageMeta.t(), String.t(), String.t()) ::
@@ -95,7 +97,14 @@ defmodule Runner.Executor do
 
     Logger.info("Docker volume: #{inspect(volume)}")
 
-    @docker_cmd_template
+    cmd_template =
+      if Application.get_env(:runner, :container_runtime) == "containerd" do
+        @nerdctl_cmd_template
+      else
+        @docker_cmd_template
+      end
+
+    cmd_template
     |> :io_lib.format([volume, lang_meta.docker_image, lang_meta.container_run_timeout])
     |> to_string
     |> String.split()

services/app/apps/runner/lib/runner/stale_containers_killer.ex

@@ -37,7 +37,7 @@ defmodule Runner.StaleContainersKiller do
   end
 
   def kill_game_container(container_id) do
-    System.cmd("docker", ["rm", "-f", container_id])
+    System.cmd(container_runtime(), ["rm", "-f", container_id])
   end
 
   def pull_game_info(game) do
@@ -47,7 +47,7 @@ defmodule Runner.StaleContainersKiller do
 
   def list_containers do
     {containers, _} =
-      System.cmd("docker", [
+      System.cmd(container_runtime(), [
         "ps",
         "-a",
         "--filter",
@@ -60,4 +60,8 @@ defmodule Runner.StaleContainersKiller do
     |> String.split("\n", trim: true)
     |> Enum.map(&pull_game_info/1)
   end
+
+  defp container_runtime do
+    Application.get_env(:runner, :container_runtime)
+  end
 end

services/app/config/releases.exs

@@ -161,6 +161,7 @@ config :runner, RunnerWeb.Endpoint,
 
 config :runner, :runner_url, "http://runner.default.svc"
 config :runner, container_killer: System.get_env("RUNNER_CONTAINER_KILLER", "") == "true"
+config :runner, container_runtime: System.get_env("RUNNER_CONTAINER_RUNTIME", "docker")
 config :runner, cpu_logger: System.get_env("RUNNER_CPU_LOGGER", "") == "true"
 
 config :runner,