Fix container_runtime

Author: vtm9

services/app/Dockerfile.runner

@@ -31,7 +31,17 @@ 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 apk update && apk add --no-cache \
+    podman \
+    iptables \
+    fuse-overlayfs \
+    shadow \
+    slirp4netns \
+    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

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

@@ -7,8 +7,7 @@ defmodule Runner.Executor do
   alias Runner.Languages
 
   @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"
+  @container_cmd_template "run --rm --init --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)
 
@@ -98,11 +97,7 @@ defmodule Runner.Executor do
     Logger.info("Docker volume: #{inspect(volume)}")
 
     cmd_template =
-      if Application.get_env(:runner, :container_runtime) == "docker" do
-        @docker_cmd_template
-      else
-        @nerdctl_cmd_template
-      end
+      Application.get_env(:runner, :container_runtime) <> " " <> @container_cmd_template
 
     cmd_template
     |> :io_lib.format([volume, lang_meta.docker_image, lang_meta.container_run_timeout])

services/app/config/config.exs

@@ -155,5 +155,6 @@ config :runner, pull_docker_images: false
 config :runner, runner_container_killer: false
 config :runner, runner_cpu_logger: false
 config :runner, white_list_lang_slugs: []
+config :runner, container_runtime: "docker"
 
 import_config "#{Mix.env()}.exs"