Get rid of base and dev variants

Author: cte

benchmark/Dockerfile

@@ -3,12 +3,58 @@
 # docker run -d -it roo-code-benchmark
 # docker exec -it $(docker ps --filter "ancestor=roo-code-benchmark" -q) /bin/bash
 
-FROM roo-code-benchmark-base
+FROM ubuntu:latest
+
+# Install dependencies
+RUN apt update && apt install -y sudo curl git vim
+
+# Create a `vscode` user
+RUN useradd -m vscode -s /bin/bash && \
+  echo "vscode ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/vscode && \
+  chmod 0440 /etc/sudoers.d/vscode
+
+# Install VS Code
+# https://code.visualstudio.com/docs/setup/linux
+RUN apt install -y wget gpg apt-transport-https
+RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+RUN install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+RUN echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | tee /etc/apt/sources.list.d/vscode.list > /dev/null
+RUN rm -f packages.microsoft.gpg
+RUN apt update && apt install -y code
+
+# Install Xvfb
+RUN apt install -y xvfb
+
+# Install Node.js 18
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt update && apt install -y nodejs
+
+# Install Python 3.12
+RUN apt install -y python3 python3-venv python3-dev python3-pip
+
+WORKDIR /home/vscode
+USER vscode
+
+COPY --chown=vscode:vscode package*.json /home/vscode/repo/
+COPY --chown=vscode:vscode webview-ui/package*.json /home/vscode/repo/webview-ui/
+COPY --chown=vscode:vscode e2e/package*.json /home/vscode/repo/e2e/
+COPY --chown=vscode:vscode benchmark/package*.json /home/vscode/repo/benchmark/
+
+WORKDIR /home/vscode/repo
+RUN npm run install:all
 
 COPY --chown=vscode:vscode . /home/vscode/repo
 
+WORKDIR /home/vscode/repo
+RUN npm run compile
+
+WORKDIR /home/vscode/repo/webview-ui
+RUN npm run build
+
 WORKDIR /home/vscode/repo/benchmark
-USER vscode
+RUN git clone https://github.com/cte/Roo-Code-Benchmark.git exercises
+RUN npm run build
+
 CMD ["/bin/bash"]
 
 # Commented out code preserved from original Dockerfile
@@ -21,11 +67,6 @@ CMD ["/bin/bash"]
 #     libboost-all-dev \
 #     && add-apt-repository ppa:deadsnakes/ppa \
 #     && apt-get update \
-#     && apt-get install -y \
-#     python3.11 \
-#     python3.11-venv \
-#     python3.11-dev \
-#     python3-pip \
 #     ca-certificates-java \
 #     openjdk-21-jdk \
 #     libtbb-dev \

benchmark/Dockerfile.base

@@ -19,3 +19,15 @@ Run an exercise:
 ```sh
 npm run docker:benchmark -- -e exercises/javascript/binary
 ```
+
+Use the cli to select and run an exercise:
+
+```sh
+npm run cli
+```
+
+Run the full benchmark:
+
+```sh
+# ... TODO ...
+```

benchmark/Dockerfile.dev

@@ -11,23 +11,14 @@
 		"cli": "tsx src/cli.ts",
 		"clean": "rimraf out",
 		"clean:exercises": "cd exercises && git checkout -f && git clean -fd",
-		"docker:base:build": "docker build -f Dockerfile.base -t roo-code-benchmark-base ..",
-		"docker:build": "npm run docker:base:build && docker build -f Dockerfile -t roo-code-benchmark ..",
+		"docker:build": "docker build -f Dockerfile -t roo-code-benchmark ..",
 		"docker:run": "docker run -d -it roo-code-benchmark",
 		"docker:start": "npm run docker:build && npm run docker:run",
 		"docker:shell": "docker exec -it $(docker ps --filter \"ancestor=roo-code-benchmark\" -q) /bin/bash",
-		"docker:benchmark": "docker exec -it $(docker ps --filter \"ancestor=roo-code-benchmark\" -q) npm run benchmark --",
+		"docker:benchmark": "docker exec -it $(docker ps --filter \"ancestor=roo-code-benchmark\" -q) xvfb-run npm run benchmark --",
 		"docker:stop": "docker stop $(docker ps --filter \"ancestor=roo-code-benchmark\" -q)",
 		"docker:rm": "docker rm $(docker ps -a --filter \"ancestor=roo-code-benchmark\" -q)",
-		"docker:clean": "npm run docker:stop && npm run docker:rm",
-		"docker:dev:build": "npm run docker:base:build && docker build -f Dockerfile.dev -t roo-code-benchmark-dev ..",
-		"docker:dev:run": "docker run -d -p 2222:22 -v ~/Documents/Roo-Code:/home/vscode/repo -it roo-code-benchmark-dev",
-		"docker:dev:start": "npm run docker:dev:build && npm run docker:dev:run",
-		"docker:dev:shell": "docker exec -it $(docker ps --filter \"ancestor=roo-code-benchmark-dev\" -q) /bin/bash",
-		"docker:dev:benchmark": "docker exec -it $(docker ps --filter \"ancestor=roo-code-benchmark-dev\" -q) xvbf-run npm run benchmark --",
-		"docker:dev:stop": "docker stop $(docker ps --filter \"ancestor=roo-code-benchmark-dev\" -q)",
-		"docker:dev:rm": "docker rm $(docker ps -a --filter \"ancestor=roo-code-benchmark-dev\" -q)",
-		"docker:dev:clean": "npm run docker:dev:stop && npm run docker:dev:rm"
+		"docker:clean": "npm run docker:stop && npm run docker:rm"
 	},
 	"devDependencies": {
 		"@vscode/test-electron": "^2.4.0",