Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

chore: move android to qemu-docker

[email protected]7114e6bef216
diff --git a/libs/python/computer/computer/providers/docker/provider.py b/libs/python/computer/computer/providers/docker/provider.py
index f35d0a5f55..e903ce09b3 100644
--- a/libs/python/computer/computer/providers/docker/provider.py
+++ b/libs/python/computer/computer/providers/docker/provider.py
@@ -59,7 +59,7 @@ class DockerProvider(BaseVMProvider):
- "trycua/cua-xfce:latest" (vanilla XFCE)
- "trycua/cua-qemu-linux:latest" (QEMU-based, only supports Ubuntu for now)
- "trycua/cua-qemu-windows:latest" (QEMU-based, only supports Windows 11 Enterprise for now)
- - "trycua/cua-android-docker:latest" (Android 11 emulator)
+ - "trycua/cua-qemu-android:latest" (QEMU-based Android 11 emulator)
verbose: Enable verbose logging
ephemeral: Use ephemeral (temporary) storage
vnc_port: Port for VNC interface (default: 6901)
@@ -79,10 +79,11 @@ class DockerProvider(BaseVMProvider):
# Detect image type and configure user directory accordingly
self._detect_image_config()
- if self._image_type == "qemu":
+ # QEMU Linux/Windows images require golden image storage
+ if self._image_type in ("qemu-linux", "qemu-windows"):
if not storage or Path(storage).is_dir() is False:
raise ValueError(
- "Golden image storage path must be provided for QEMU-based images."
+ "Golden image storage path must be provided for QEMU-based Linux/Windows images."
)
self.storage = storage
elif ephemeral:
@@ -92,21 +93,26 @@ class DockerProvider(BaseVMProvider):
def _detect_image_config(self):
"""Detect image type and configure paths accordingly."""
- # Detect if this is a XFCE, Kasm, QEMU, or Android image
+ # Detect if this is a XFCE, Kasm, or QEMU-based image
if "docker-xfce" in self.image.lower() or "xfce" in self.image.lower():
self._home_dir = "/home/cua"
self._image_type = "docker-xfce"
logger.info(f"Detected docker-xfce image: using {self._home_dir}")
- elif any(x in self.image.lower() for x in ("qemu-linux", "qemu-windows")):
- # QEMU-based images
+ elif "qemu-linux" in self.image.lower():
+ # QEMU-based Linux images
self._home_dir = ""
- self._image_type = "qemu"
- logger.info("Detected QEMU image: using /")
- elif "droid" in self.image.lower():
- # Android-based images
+ self._image_type = "qemu-linux"
+ logger.info("Detected QEMU Linux image: using /")
+ elif "qemu-windows" in self.image.lower():
+ # QEMU-based Windows images
+ self._home_dir = ""
+ self._image_type = "qemu-windows"
+ logger.info("Detected QEMU Windows image: using /")
+ elif "qemu-android" in self.image.lower():
+ # QEMU-based Android images
self._home_dir = "/home/androidusr"
- self._image_type = "android"
- logger.info("Detected Android image: using /home/androidusr")
+ self._image_type = "qemu-android"
+ logger.info("Detected QEMU Android image: using /home/androidusr")
else:
# Default to Kasm configuration
self._home_dir = "/home/kasm-user"
@@ -298,59 +304,56 @@ class DockerProvider(BaseVMProvider):
# Build docker run command
cmd = ["docker", "run", "-d", "--name", name]
- if self._image_type != "qemu":
- # Add memory limit if specified
- if "memory" in run_opts:
- memory_limit = self._parse_memory(run_opts["memory"])
- cmd.extend(["--memory", memory_limit])
+ # Add memory limit if specified
+ if "memory" in run_opts:
+ memory_limit = self._parse_memory(run_opts["memory"])
+ cmd.extend(["--memory", memory_limit])
- # Add CPU limit if specified
- if "cpu" in run_opts:
- cpu_count = str(run_opts["cpu"])
- cmd.extend(["--cpus", cpu_count])
+ # Add CPU limit if specified
+ if "cpu" in run_opts:
+ cpu_count = str(run_opts["cpu"])
+ cmd.extend(["--cpus", cpu_count])
# Add devices if specified (e.g., /dev/kvm for QEMU and Android)
- warn_no_kvm = False
has_kvm = False
if "devices" in run_opts:
devices = run_opts["devices"]
has_kvm = "/dev/kvm" in devices
- warn_no_kvm = self._image_type == "qemu" and not has_kvm
for device in devices:
cmd.extend(["--device", device])
elif "device" in run_opts:
has_kvm = run_opts["device"] == "/dev/kvm"
- warn_no_kvm = self._image_type == "qemu" and not has_kvm
cmd.extend(["--device", run_opts["device"]])
- # Android requires /dev/kvm
- if self._image_type == "android" and not has_kvm:
+ # QEMU Android requires /dev/kvm
+ if self._image_type == "qemu-android" and not has_kvm:
raise ValueError(
- "Android images require /dev/kvm device. "
+ "Android images requires KVM. "
'Add run_opts={"devices": ["/dev/kvm"]} to your Computer configuration.'
)
- if warn_no_kvm:
+ if self._image_type in ("qemu-linux", "qemu-windows") and not has_kvm:
logger.warning(
"/dev/kvm device is recommended for QEMU images for better performance."
)
- # Add NET_ADMIN capability for QEMU images
- if self._image_type == "qemu":
+ # Add NET_ADMIN capability for QEMU Linux/Windows images
+ if self._image_type in ("qemu-linux", "qemu-windows"):
cmd.extend(["--cap-add", "NET_ADMIN"])
# Add port mappings
vnc_port = run_opts.get("vnc_port", self.vnc_port)
api_port = run_opts.get("api_port", self.api_port)
- # Port mappings differ for QEMU, Android vs Kasm/XFCE images
- if self._image_type == "qemu":
+ # Port mappings differ by image type
+ if self._image_type in ("qemu-linux", "qemu-windows"):
internal_vnc_port = 8006
internal_api_port = 5000
- elif self._image_type == "android":
+ elif self._image_type == "qemu-android":
internal_vnc_port = 6080
internal_api_port = 8000
else:
+ # Kasm/XFCE images
internal_vnc_port = 6901
internal_api_port = 8000
@@ -375,7 +378,7 @@ class DockerProvider(BaseVMProvider):
cmd.extend(["-e", "VNCOPTIONS=-disableBasicAuth"]) # Disable VNC basic auth
# Add Android-specific default environment variables
- if self._image_type == "android":
+ if self._image_type == "qemu-android":
if "env" not in run_opts:
run_opts["env"] = {}
run_opts["env"].setdefault("EMULATOR_DEVICE", "Samsung Galaxy S10")
diff --git a/libs/android-docker/Dockerfile b/libs/qemu-docker/android/Dockerfile
similarity index 96%
rename from libs/android-docker/Dockerfile
rename to libs/qemu-docker/android/Dockerfile
index 5cc25365d0..43d9eb60d4 100644
--- a/libs/android-docker/Dockerfile
+++ b/libs/qemu-docker/android/Dockerfile
@@ -17,7 +17,7 @@ ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tool
RUN yes | sdkmanager --licenses && \
sdkmanager "platforms;android-30" "build-tools;30.0.3"
-COPY wallpaper-manager /build/wallpaper-manager
+COPY src/wallpaper-manager /build/wallpaper-manager
WORKDIR /build/wallpaper-manager
RUN curl -fsSL -o gradle/wrapper/gradle-wrapper.jar \
@@ -57,7 +57,7 @@ ENV PATH="/opt/venv/bin:$PATH"
RUN /opt/venv/bin/pip install --no-cache-dir --upgrade pip && \
/opt/venv/bin/pip install --no-cache-dir cua-computer-server
-COPY entry.sh /usr/local/bin/entry.sh
+COPY src/entry.sh /usr/local/bin/entry.sh
RUN chmod +x /usr/local/bin/entry.sh
# Make venv accessible to androidusr
diff --git a/libs/android-docker/README.md b/libs/qemu-docker/android/README.md
similarity index 85%
rename from libs/android-docker/README.md
rename to libs/qemu-docker/android/README.md
index 8e4111f512..e8fcd97ea1 100644
--- a/libs/android-docker/README.md
+++ b/libs/qemu-docker/android/README.md
@@ -1,6 +1,6 @@
-# Android Docker
+# QEMU Android
-Docker image that runs an Android emulator with CUA Computer Server integration, enabling programmatic control of Android devices via HTTP API.
+Docker image that runs an Android emulator using QEMU/KVM with CUA Computer Server integration, enabling programmatic control of Android devices via HTTP API.
## Features
@@ -21,27 +21,26 @@ Docker image that runs an Android emulator with CUA Computer Server integration,
### Production Build
```bash
-cd android-docker
-docker build -t trycua/cua-android-docker .
+docker build -t trycua/cua-qemu-android .
docker run -d -p 6080:6080 -p 8000:8000 \
-e EMULATOR_DEVICE="Samsung Galaxy S10" \
-e WEB_VNC=true \
--device /dev/kvm \
--name android-container \
- trycua/cua-android-docker
+ trycua/cua-qemu-android
```
### Development Build
```bash
-cd .. # Go to libs/ directory
-docker build -f android-docker/dev.Dockerfile -t trycua/cua-android-docker:dev .
+cd ../.. # Go to libs/ directory
+docker build -f qemu-docker/android/dev.Dockerfile -t trycua/cua-qemu-android:dev .
docker run -d -p 6080:6080 -p 8000:8000 \
-e EMULATOR_DEVICE="Samsung Galaxy S10" \
-e WEB_VNC=true \
--device /dev/kvm \
--name android-container \
- trycua/cua-android-docker:dev
+ trycua/cua-qemu-android:dev
```
## Access Points
diff --git a/libs/android-docker/dev.Dockerfile b/libs/qemu-docker/android/dev.Dockerfile
similarity index 92%
rename from libs/android-docker/dev.Dockerfile
rename to libs/qemu-docker/android/dev.Dockerfile
index 1d2976524d..282beed4ff 100644
--- a/libs/android-docker/dev.Dockerfile
+++ b/libs/qemu-docker/android/dev.Dockerfile
@@ -1,6 +1,6 @@
# ============================================================================
# Development Dockerfile - builds from libs/ directory with local sources
-# Build command: docker build -f android-docker/dev.Dockerfile -t android-cua:dev .
+# Build command: docker build -f qemu-docker/android/dev.Dockerfile -t cua-qemu-android:dev .
# ============================================================================
# ============================================================================
@@ -22,7 +22,7 @@ ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tool
RUN yes | sdkmanager --licenses && \
sdkmanager "platforms;android-30" "build-tools;30.0.3"
-COPY android-docker/wallpaper-manager /build/wallpaper-manager
+COPY qemu-docker/android/src/wallpaper-manager /build/wallpaper-manager
WORKDIR /build/wallpaper-manager
RUN curl -fsSL -o gradle/wrapper/gradle-wrapper.jar \
@@ -65,7 +65,7 @@ WORKDIR /tmp/computer-server
RUN /opt/venv/bin/pip install --no-cache-dir --upgrade pip && \
/opt/venv/bin/pip install --no-cache-dir -e .
-COPY android-docker/entry.sh /usr/local/bin/entry.sh
+COPY qemu-docker/android/src/entry.sh /usr/local/bin/entry.sh
RUN chmod +x /usr/local/bin/entry.sh
# Make venv accessible to androidusr
diff --git a/libs/android-docker/entry.sh b/libs/qemu-docker/android/src/entry.sh
similarity index 100%
rename from libs/android-docker/entry.sh
rename to libs/qemu-docker/android/src/entry.sh
diff --git a/libs/android-docker/wallpaper-manager/.gitignore b/libs/qemu-docker/android/src/wallpaper-manager/.gitignore
similarity index 100%
rename from libs/android-docker/wallpaper-manager/.gitignore
rename to libs/qemu-docker/android/src/wallpaper-manager/.gitignore
diff --git a/libs/android-docker/wallpaper-manager/app/build.gradle b/libs/qemu-docker/android/src/wallpaper-manager/app/build.gradle
similarity index 100%
rename from libs/android-docker/wallpaper-manager/app/build.gradle
rename to libs/qemu-docker/android/src/wallpaper-manager/app/build.gradle
diff --git a/libs/android-docker/wallpaper-manager/app/src/main/AndroidManifest.xml b/libs/qemu-docker/android/src/wallpaper-manager/app/src/main/AndroidManifest.xml
similarity index 100%
rename from libs/android-docker/wallpaper-manager/app/src/main/AndroidManifest.xml
rename to libs/qemu-docker/android/src/wallpaper-manager/app/src/main/AndroidManifest.xml
diff --git a/libs/android-docker/wallpaper-manager/app/src/main/java/com/example/cua/wallpaper/SetWallpaperActivity.java b/libs/qemu-docker/android/src/wallpaper-manager/app/src/main/java/com/example/cua/wallpaper/SetWallpaperActivity.java
similarity index 100%
rename from libs/android-docker/wallpaper-manager/app/src/main/java/com/example/cua/wallpaper/SetWallpaperActivity.java
rename to libs/qemu-docker/android/src/wallpaper-manager/app/src/main/java/com/example/cua/wallpaper/SetWallpaperActivity.java
diff --git a/libs/android-docker/wallpaper-manager/build.gradle b/libs/qemu-docker/android/src/wallpaper-manager/build.gradle
similarity index 100%
rename from libs/android-docker/wallpaper-manager/build.gradle
rename to libs/qemu-docker/android/src/wallpaper-manager/build.gradle
diff --git a/libs/android-docker/wallpaper-manager/gradle/wrapper/gradle-wrapper.properties b/libs/qemu-docker/android/src/wallpaper-manager/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from libs/android-docker/wallpaper-manager/gradle/wrapper/gradle-wrapper.properties
rename to libs/qemu-docker/android/src/wallpaper-manager/gradle/wrapper/gradle-wrapper.properties
diff --git a/libs/android-docker/wallpaper-manager/gradlew b/libs/qemu-docker/android/src/wallpaper-manager/gradlew
similarity index 100%
rename from libs/android-docker/wallpaper-manager/gradlew
rename to libs/qemu-docker/android/src/wallpaper-manager/gradlew
diff --git a/libs/android-docker/wallpaper-manager/settings.gradle b/libs/qemu-docker/android/src/wallpaper-manager/settings.gradle
similarity index 100%
rename from libs/android-docker/wallpaper-manager/settings.gradle
rename to libs/qemu-docker/android/src/wallpaper-manager/settings.gradle