Make base dockerfile configurable

swe-bench · Feb 19, 2025 · f44fc04 · f44fc04
1 parent 2f621d5
commit f44fc04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/swebench/harness/dockerfiles/__init__.py b/swebench/harness/dockerfiles/__init__.py
@@ -25,13 +25,21 @@
     "js": _DOCKERFILE_INSTANCE_JS,
 }
 
+_DEFAULT_VERSIONS = {
+    "conda_version": "py311_23.11.0-2",
+    "ubuntu_version": "22.04",
+}
+
 
-def get_dockerfile_base(platform, arch, language):
+def get_dockerfile_base(platform, arch, language, **kwargs):
     if arch == "arm64":
         conda_arch = "aarch64"
     else:
         conda_arch = arch
-    return _DOCKERFILE_BASE[language].format(platform=platform, conda_arch=conda_arch)
+    # Combine kwargs into _DEFAULT_VERSIONS
+    return _DOCKERFILE_BASE[language].format(
+        platform=platform, conda_arch=conda_arch, **_DEFAULT_VERSIONS, **kwargs
+    )
 
 
 def get_dockerfile_env(platform, arch, language, **kwargs):

diff --git a/swebench/harness/dockerfiles/javascript.py b/swebench/harness/dockerfiles/javascript.py
@@ -1,5 +1,5 @@
 _DOCKERFILE_BASE_JS = r"""
-FROM --platform={platform} ubuntu:22.04
+FROM --platform={platform} ubuntu:{ubuntu_version}
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC

diff --git a/swebench/harness/dockerfiles/python.py b/swebench/harness/dockerfiles/python.py
@@ -1,5 +1,5 @@
 _DOCKERFILE_BASE_PY = r"""
-FROM --platform={platform} ubuntu:22.04
+FROM --platform={platform} ubuntu:{ubuntu_version}
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
@@ -21,7 +21,7 @@
 && rm -rf /var/lib/apt/lists/*
 
 # Download and install conda
-RUN wget 'https://repo.anaconda.com/miniconda/Miniconda3-py311_23.11.0-2-Linux-{conda_arch}.sh' -O miniconda.sh \
+RUN wget 'https://repo.anaconda.com/miniconda/Miniconda3-{conda_version}-Linux-{conda_arch}.sh' -O miniconda.sh \
     && bash miniconda.sh -b -p /opt/miniconda3
 # Add conda to PATH
 ENV PATH=/opt/miniconda3/bin:$PATH