Updated base image

Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.dockerignore

@@ -1,5 +1,7 @@
 # Git
 .git/
+.github
+.gitignore
 
 # IDE
 **/*.idea
@@ -17,3 +19,10 @@ backup
 **/xunit.xml
 **/coverage
 tmp/
+
+docker
+documentations
+example
+images
+*.md
+*.sh

.github/dependabot.yml

@@ -9,20 +9,10 @@ updates:
   commit-message:
     prefix: "[docker] "
   target-branch: "master"
-  open-pull-requests-limit: 99
-  reviewers:
-    - "budtmo"
-
-- package-ecosystem: pip
-  directory: "/"
-  schedule:
-    interval: daily
-    time: '01:00'
-    timezone: "Europe/Berlin"
-  commit-message:
-    prefix: "[pip] "
-  target-branch: "master"
-  open-pull-requests-limit: 99
+  open-pull-requests-limit: 10
+  labels:
+    - "dependabot"
+    - "docker"
   reviewers:
     - "budtmo"
 
@@ -35,6 +25,25 @@ updates:
   commit-message:
     prefix: "[github-action] "
   target-branch: "master"
-  open-pull-requests-limit: 99
+  open-pull-requests-limit: 10
+  labels:
+    - "dependabot"
+    - "github-action"
+  reviewers:
+    - "budtmo"
+
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '01:00'
+    timezone: "Europe/Berlin"
+  commit-message:
+    prefix: "[pip] "
+  target-branch: "master"
+  open-pull-requests-limit: 10
+  labels:
+    - "dependabot"
+    - "pip"
   reviewers:
     - "budtmo"

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
         python-version: ["3.8"]
     steps:
     - name: Checkout the repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Run unit-test
       run: script -e -c "./app.sh test emulator test 11.0 && sudo mv tmp/* ."
@@ -23,7 +23,7 @@ jobs:
     needs: run_test
     steps:
     - name: Checkout the repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Get release version
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
@@ -42,10 +42,10 @@ jobs:
         android: ["9.0", "10.0", "11.0", "12.0", "13.0", "14.0"]
     steps:
     - name: Checkout the repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v4
 
     - name: Get release version
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
@@ -67,10 +67,10 @@ jobs:
     needs: release_base
     steps:
     - name: Checkout the repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v4
 
     - name: Get release version
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

.github/workflows/test-on-demand.yml

@@ -0,0 +1,32 @@
+name: Run Test on Demand
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Checkout the repo
+      uses: actions/checkout@v7
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v4
+
+    - name: Set up extension
+      run: |
+        echo "${{ secrets.extension }}" > extension.sh
+        chmod 700 extension.sh
+      shell: bash
+
+    - name: Build base image
+      run: script -e -c "./app.sh build base test"
+
+    - name: Build sample image
+      run: script -e -c "./app.sh build emulator test 11.0"
+
+    - name: Run unit-test
+      run: script -e -c "./app.sh test emulator test 11.0 && sudo mv tmp/* ."
+
+    - name: Publish test result
+      run: bash <(curl -s https://codecov.io/bash)

.github/workflows/test.yml

@@ -4,19 +4,17 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - master
 
 jobs:
   build_and_test:
     runs-on: ubuntu-24.04
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.actor == 'budtmo'
     steps:
     - name: Checkout the repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v4
 
     - name: Set up extension
       run: |

README.md

@@ -96,15 +96,19 @@ Credit goes to [Guillaume - The Parallel Interface blog](https://www.paralint.co
     sudo usermod -a -G kvm ${USER}
     ```
 
-2. Add necessary flags to `/etc/wsl2.conf` to their respective sections.
+2. Add necessary flags to `/etc/wsl.conf` to their respective sections.
     ```
     [boot]
     command = /bin/bash -c 'chown -v root:kvm /dev/kvm && chmod 660 /dev/kvm'
+    ```
 
+    Then, using PowerShell, open a notepad on `notepad $env:USERPROFILE\.wslconfig`. Inside, put these other flags:
+    ```
     [wsl2]
     nestedVirtualization=true
     ```
-3. Restart WSL2 via CMD prompt or Powershell
+
+4. Restart WSL2 via CMD prompt or Powershell
     ```
     wsl --shutdown
     ```
@@ -114,6 +118,8 @@ Credit goes to [Guillaume - The Parallel Interface blog](https://www.paralint.co
 
 `nestedVirtualization` flag is only available to Windows 11.
 
+If this setup does not work, you may have an old WSL version. In that case, ignore `\.wslconfig` and put everything on `/etc/wsl.conf`, including the `[wsl2]` flag.
+
 Use-Cases
 ---------
 
@@ -163,7 +169,7 @@ The differences between normal version and pro version are:
 |user-behavior-analytics|Yes|No|-|
 |proxy|No|Yes|Set up company proxy on Android emulator on fly|
 |language|No|Yes|Set up language on Android emulator on fly|
-|Newer Android version|No|Yes|Support other newer Android version e.g. Android 15, etc|
+|Newer Android version|No|Yes|Support other newer Android version e.g. Android 15, Android 16, etc|
 |root-privileged|No|Yes|Able to run command with security privileged|
 |headless-mode|No|Yes|Save resources by using headless mode|
 |Selenium 4.x integration|No|Yes|Running Appium UI-Tests againt one (Selenium Hub) endpoint for Android- and iOS emulator(s) / device(s)|

cli/requirements.txt

@@ -1,9 +1,9 @@
 autopep8==2.3.2
-click==8.2.1
-coverage==7.8.1
+click==8.4.1
+coverage==7.14.3
 mock==5.2.0
-pytest==8.4.1
-pytest-cov==6.2.1
-pytest-xdist==3.7.0
-requests==2.32.3
-setuptools==80.8.0
+pytest==9.1.1
+pytest-cov==7.1.0
+pytest-xdist==3.8.0
+requests==2.34.2
+setuptools==82.0.1

cli/src/app.py

@@ -60,7 +60,7 @@ def cli():
 
 def start_appium() -> None:
     if convert_str_to_bool(os.getenv(ENV.APPIUM)):
-        cmd = f"/usr/bin/appium"
+        cmd = f"/usr/local/bin/appium"
         app_appium = Application("Appium", cmd,
                                  os.getenv(ENV.APPIUM_ADDITIONAL_ARGS, ""), False)
         app_appium.start()

cli/src/device/emulator.py

@@ -23,7 +23,9 @@ class Emulator(Device):
         "Samsung Galaxy S8",
         "Samsung Galaxy S9",
         "Samsung Galaxy S10",
-        "Pixel C"
+        "Pixel C",
+        "Pixel 8",
+        "Pixel 9"
     )
 
     API_LEVEL = {
@@ -151,7 +153,8 @@ class Emulator(Device):
             creation_cmd = "avdmanager create avd -f -n {n} -b {it}/{si} " \
                            "-k 'system-images;android-{al};{it};{si}' " \
                            "-d {d} -p {pe}".format(n=self.name, it=self.img_type, si=self.sys_img,
-                                                   al=self.api_level, d=self.device.replace(" ", "\ "),
+                                                   al=self.api_level,
+                                                   d=self.device.lower().replace(" ", "_") if "pixel" in self.device.lower() else self.device.replace(" ", "\ "),
                                                    pe=self.path_emulator)
             self.logger.info(f"Command to create emulator: '{creation_cmd}'")
             subprocess.check_call(creation_cmd, shell=True)

cli/src/device/geny_saas.py

@@ -1,19 +1,20 @@
 import logging
 import os
 import subprocess
+import concurrent.futures
+import uuid
 
 from device import Genymotion, DeviceType
 from helper import get_env_value_or_raise
 from constants import ENV, UTF8
 
-
 class GenySAAS(Genymotion):
     def __init__(self) -> None:
         super().__init__()
         self.logger = logging.getLogger(self.__class__.__name__)
         self.device_type = DeviceType.GENY_SAAS.value
         self.created_devices = []
-
+    
     def login(self) -> None:
         if os.getenv(ENV.GENY_AUTH_TOKEN):
             auth_token = get_env_value_or_raise(ENV.GENY_AUTH_TOKEN)
@@ -23,14 +24,16 @@ class GenySAAS(Genymotion):
             password = get_env_value_or_raise(ENV.GENY_SAAS_PASS)
             subprocess.check_call(f"gmsaas auth login {user} {password} > /dev/null 2>&1", shell=True)
         self.logger.info("successfully logged in!")
-
+    
     def create(self) -> None:
         super().create()
+        
+        # Collect all items first
+        items = []
         for item in self.get_data_from_template(ENV.GENY_SAAS_TEMPLATE_FILE_NAME):
             name = ""
             template = ""
             local_port = ""
-
             # implement like this because local_port param is not a must
             for k, v in item.items():
                 if k.lower() == "name":
@@ -41,40 +44,98 @@ class GenySAAS(Genymotion):
                     local_port = v
                 else:
                     self.logger.warning(f"'{k}' is not supported! Please check the documentation!")
-
+            
             if not name:
-                import uuid
                 name = str(uuid.uuid4())
-
+            
             if not template:
                 self.shutdown_and_logout()
                 raise RuntimeError(f"'template' is a must parameter and not given!")
-            else:
-                self.logger.info(f"name: {name}, template: {template}")
-                creation_cmd = f"gmsaas instances start {template} {name}"
-                try:
-                    instance_id = subprocess.check_output(creation_cmd.split()).decode(UTF8).replace("\n", "")
-                    created_device = {f"{name}": {instance_id}}
-                    self.created_devices.append(created_device)
-                    additional_args = ""
-                    if local_port:
-                        additional_args = f"--adb-serial-port {local_port}"
-                    connect_cmd = f"gmsaas instances adbconnect {instance_id} {additional_args}"
-                    subprocess.check_call(f"{connect_cmd}", shell=True)
-                except Exception as e:
-                    self.shutdown_and_logout()
-                    self.logger.error(e)
-                    exit(1)
+            
+            items.append({
+                'name': name,
+                'template': template,
+                'local_port': local_port
+            })
+        
+        # Start all devices in parallel
+        with concurrent.futures.ThreadPoolExecutor(max_workers=100) as executor:
+            try:
+                # Submit all tasks
+                future_to_item = {executor.submit(self.create_instance, item): item for item in items}
+                
+                # Collect results as they complete
+                for future in concurrent.futures.as_completed(future_to_item):
+                    item = future_to_item[future]
+                    try:
+                        created_device = future.result()
+                        self.created_devices.append(created_device)
+                        self.logger.info(f"Successfully created device: {created_device}")
+                    except Exception as e:
+                        self.logger.error(f"Instance creation failed for {item['name']}: {e}")
+                        self.shutdown_and_logout()
+                        exit(1)
+                        
+            except Exception as e:
+                self.shutdown_and_logout()
+                self.logger.error(f"Parallel execution failed: {e}")
+                exit(1)
+
+    def create_instance(self, item_data):
+        """Create a single instance and return the result"""
+        name = item_data['name']
+        template = item_data['template']
+        local_port = item_data['local_port']
+
+        self.logger.info(f"name: {name}, template: {template}")
+        creation_cmd = f"gmsaas instances start {template} {name}"
+
+        try:
+            instance_id = subprocess.check_output(creation_cmd.split()).decode(UTF8).replace("\n", "")
+
+            # Connect to ADB
+            additional_args = ""
+            if local_port:
+                additional_args = f"--adb-serial-port {local_port}"
+            connect_cmd = f"gmsaas instances adbconnect {instance_id} {additional_args}"
+            subprocess.check_call(f"{connect_cmd}", shell=True)
+
+            return {f"{name}": instance_id}
+
+        except Exception as e:
+            self.logger.error(f"Failed to create instance {name}: {e}")
+            raise e
+
+    def stop_instance(self, device_info):
+        """Stop a single instance"""
+        for name, instance_id in device_info.items():
+            try:
+                subprocess.check_call(f"gmsaas instances stop {instance_id}", shell=True)
+                self.logger.info(f"device '{name}' is successfully removed!")
+                return True
+            except Exception as e:
+                self.logger.error(f"Failed to stop device '{name}': {e}")
+                return False
 
     def shutdown_and_logout(self) -> None:
         if bool(self.created_devices):
             self.logger.info("Created device(s) will be removed!")
-            for d in self.created_devices:
-                for n, i in d.items():
-                    subprocess.check_call(f"gmsaas instances stop {i}", shell=True)
-                    self.logger.info(f"device '{n}' is successfully removed!")
+            
+            # Stop all devices in parallel
+            with concurrent.futures.ThreadPoolExecutor(max_workers=100) as executor:
+                # Submit all stop tasks
+                futures = [executor.submit(self.stop_instance, device) for device in self.created_devices]
+                
+                # Wait for all to complete
+                for future in concurrent.futures.as_completed(futures):
+                    try:
+                        future.result()
+                    except Exception as e:
+                        self.logger.error(f"Error during device shutdown: {e}")
+        
+        # Logout after all devices are stopped
         if os.getenv(ENV.GENY_AUTH_TOKEN):
             subprocess.check_call("gmsaas auth reset", shell=True)
         else:
             subprocess.check_call("gmsaas auth logout", shell=True)
-        self.logger.info("successfully logged out!")
+        self.logger.info("successfully logged out!")

docker/base

@@ -1,4 +1,4 @@
-FROM appium/appium:v2.19.0-p0
+FROM appium/appium:v3.5.2-p0
 
 ARG AUTHORS="Budi Utomo"
 LABEL author="${AUTHORS} <budtmo.os@gmail.com>"
@@ -8,27 +8,30 @@ USER root
 #================
 # Basic Packages
 #----------------
+# ca-certificates
+#   SSL client
+# python3-pip
+#   python-pip
 # socat
 #   Port forwarder
 # supervisor
 #   Process manager
+# unzip
+#   Unzip zip file
+# wget
+#   Network downloader
 #================
 RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \
+    ca-certificates \
+    python3-pip \
     socat \
     supervisor \
+    unzip \
+    wget \
  && apt autoremove -y \
  && apt clean all \
- && rm -rf /var/lib/apt/lists/*
-
-#==================
-# Configure Python
-#==================
-RUN apt-get -qqy update && \
-    apt-get -qqy --no-install-recommends install \
-    python3-pip \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
+ && rm -rf /var/lib/apt/lists/* \
+ && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
 
 #=====================
 # Set release version

docker/emulator

@@ -11,7 +11,7 @@ ENV EMULATOR_ANDROID_VERSION=${EMULATOR_ANDROID_VERSION} \
     EMULATOR_SYS_IMG=x86_64 \
     EMULATOR_IMG_TYPE=google_apis \
     EMULATOR_BROWSER=chrome
-ENV PATH ${PATH}:${ANDROID_HOME}/build-tools
+ENV PATH=${PATH}:${ANDROID_HOME}/build-tools
 RUN yes | sdkmanager --licenses \
  && sdkmanager "platforms;android-${EMULATOR_API_LEVEL}" \
  "system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_IMG_TYPE};${EMULATOR_SYS_IMG}" "emulator" \
@@ -20,14 +20,10 @@ RUN yes | sdkmanager --licenses \
 #=============
 # UI Packages
 #-------------
-# ffmpeg
-#   Video recorder
 # feh
 #   Screen background
 # libxcomposite-dev
 #   Window System for Emulator
-# menu
-#   Debian menu
 # openbox
 #   Windows manager
 # x11vnc
@@ -36,10 +32,8 @@ RUN yes | sdkmanager --licenses \
 #   Terminal emulator
 #==================
 RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \
-    ffmpeg \
     feh \
     libxcomposite-dev \
-    menu \
     openbox \
     x11vnc \
     xterm \
@@ -50,8 +44,8 @@ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \
 #=======
 # noVNC
 #=======
-ENV NOVNC_VERSION="1.4.0" \
-    WEBSOCKIFY_VERSION="0.11.0" \
+ENV NOVNC_VERSION="1.7.0" \
+    WEBSOCKIFY_VERSION="0.13.0" \
     OPT_PATH="/opt"
 RUN  wget -nv -O noVNC.zip "https://github.com/novnc/noVNC/archive/refs/tags/v${NOVNC_VERSION}.zip" \
  && unzip -x noVNC.zip \
@@ -78,13 +72,13 @@ EXPOSE 5900 6080
 #==========
 RUN rm -rf ${SCRIPT_PATH}
 ENV SCRIPT_PATH="docker-android"
-ENV WORK_PATH="/home/androidusr"
 ENV APP_PATH=${WORK_PATH}/${SCRIPT_PATH}
 RUN mkdir -p ${APP_PATH}
 COPY mixins ${APP_PATH}/mixins
 COPY cli ${APP_PATH}/cli
 RUN --mount=type=secret,id=extension,dst=/tmp/extension.sh \
     bash /tmp/extension.sh
+RUN echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 #===================
 # Configure OpenBox
@@ -94,7 +88,7 @@ RUN echo ${APP_PATH}/mixins/configs/display/.fehbg >> /etc/xdg/openbox/autostart
 #==================
 # Use created user
 #==================
-USER 1300:1301
+USER ${USERID}:${GROUPID}
 ENV LOG_PATH=${WORK_PATH}/logs \
     WEB_LOG_PORT=9000
 EXPOSE 9000
@@ -107,4 +101,4 @@ RUN mkdir -p "${WORK_PATH}/.config/Android Open Source Project" \
 #=========
 STOPSIGNAL SIGTERM
 ENV DEVICE_TYPE=emulator
-ENTRYPOINT ["/home/androidusr/docker-android/mixins/scripts/run.sh"]
+CMD ["${APP_PATH}/mixins/scripts/run.sh"]

docker/genymotion

@@ -1,7 +1,7 @@
 ARG DOCKER_ANDROID_VERSION
 FROM budtmo/docker-android:base_${DOCKER_ANDROID_VERSION}
 
-ENV GMSAAS_CLI_VERSION="1.14.1"
+ENV GMSAAS_CLI_VERSION="1.15.0"
 
 #================
 # Cloud Packages
@@ -30,7 +30,6 @@ RUN wget -nv -O terraform.zip "https://releases.hashicorp.com/terraform/${TERRAF
 #==========
 RUN rm -rf ${SCRIPT_PATH}
 ENV SCRIPT_PATH="docker-android"
-ENV WORK_PATH="/home/androidusr"
 ENV APP_PATH=${WORK_PATH}/${SCRIPT_PATH}
 RUN mkdir -p ${APP_PATH}
 COPY mixins ${APP_PATH}/mixins
@@ -47,7 +46,7 @@ RUN mkdir -p ${GENYMOTION_TEMPLATE_PATH}
 #==================
 # Use created user
 #==================
-USER 1300:1301
+USER ${USERID}:${GROUPID}
 ENV LOG_PATH=${WORK_PATH}/logs \
     WEB_LOG_PORT=9000
 EXPOSE 9000
@@ -58,4 +57,4 @@ RUN mkdir -p ${LOG_PATH}
 #=========
 STOPSIGNAL SIGTERM
 RUN gmsaas config set android-sdk-path ${ANDROID_HOME}
-ENTRYPOINT ["/home/androidusr/docker-android/mixins/scripts/run.sh"]
+CMD ["${APP_PATH}/mixins/scripts/run.sh"]

documentations/DOCKER-ANDROID-PRO.md

@@ -29,6 +29,7 @@ List of Docker-Images
 |13.0|33|Normal|budtmo2/docker-android-pro:emulator_13.0|budtmo2/docker-android-pro:emulator_13.0_<release_version>|
 |14.0|34|Normal|budtmo2/docker-android-pro:emulator_14.0|budtmo2/docker-android-pro:emulator_14.0_<release_version>|
 |15.0|35|Normal|budtmo2/docker-android-pro:emulator_15.0|budtmo2/docker-android-pro:emulator_15.0_<release_version>|
+|16.0|36|Normal|budtmo2/docker-android-pro:emulator_16.0|budtmo2/docker-android-pro:emulator_16.0_<release_version>|
 |9.0|28|Headless|budtmo2/docker-android-pro:emulator_headless_9.0|budtmo2/docker-android-pro:emulator_headless_9.0_<release_version>|
 |10.0|29|Headless|budtmo2/docker-android-pro:emulator_headless_10.0|budtmo2/docker-android-pro:emulator_headless_10.0_<release_version>|
 |11.0|30|Headless|budtmo2/docker-android-pro:emulator_headless_11.0|budtmo2/docker-android-pro:emulator_headless_11.0_<release_version>|
@@ -36,6 +37,7 @@ List of Docker-Images
 |13.0|33|Headless|budtmo2/docker-android-pro:emulator_headless_13.0|budtmo2/docker-android-pro:emulator_headless_13.0_<release_version>|
 |14.0|34|Headless|budtmo2/docker-android-pro:emulator_headless_14.0|budtmo2/docker-android-pro:emulator_headless_14.0_<release_version>|
 |15.0|35|Headless|budtmo2/docker-android-pro:emulator_headless_15.0|budtmo2/docker-android-pro:emulator_headless_15.0_<release_version>|
+|16.0|36|Headless|budtmo2/docker-android-pro:emulator_headless_16.0|budtmo2/docker-android-pro:emulator_headless_16.0_<release_version>|
 |-|-|Selenium|budtmo2/docker-android-pro:selenium|budtmo2/docker-android-pro:selenium_<release_version>|
 
 ***Note: Headless mode does not have any Web-UI***