Merge pull request #403 from enrey/restart_fix

Fixed docker container stop/start blank background error

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -51,7 +51,7 @@ jobs:
     needs: release_base
     strategy:
       matrix:
-        android: ["9.0", "10.0", "11.0", "12.0", "13.0"]
+        android: ["9.0", "10.0", "11.0", "12.0", "13.0", "14.0"]
     steps:
     - name: Checkout the repo
       uses: actions/checkout@v4

README.md

@@ -11,7 +11,7 @@ Advantages of using this projects
 ---------------------------------
 1. Emulator with different device profile and skins, such as Samsung Galaxy S6, LG Nexus 4, HTC Nexus One and more.
 2. Support vnc to be able to see what happen inside docker container
-3. Support log sharing feature where all logs can be accessed from web-UI 
+3. Support log sharing feature where all logs can be accessed from web-UI
 4. Ability to control emulator from outside container by using adb connect
 5. Integrated with other cloud solutions, e.g. [Genymotion Cloud](https://www.genymotion.com/cloud/)
 6. It can be used to build Android project
@@ -26,6 +26,7 @@ List of Docker-Images
 |11.0|30|budtmo/docker-android:emulator_11.0|budtmo/docker-android:emulator_11.0_<release_version>|
 |12.0|32|budtmo/docker-android:emulator_12.0|budtmo/docker-android:emulator_12.0_<release_version>|
 |13.0|33|budtmo/docker-android:emulator_13.0|budtmo/docker-android:emulator_13.0_<release_version>|
+|14.0|34|budtmo/docker-android:emulator_14.0|budtmo/docker-android:emulator_14.0_<release_version>|
 |-|-|budtmo/docker-android:genymotion|budtmo/docker-android:genymotion_<release_version>|
 
 List of Devices
@@ -73,6 +74,14 @@ Quick Start
     docker exec -it android-container cat device_status
     ```
 
+Persisting data
+-----------
+
+The default behaviour is to destroy the emulated device on container restart. To persist data, you need to mount a volume at `/home/androidusr`:
+    ```
+    docker run -v data:/home/androidusr budtmo/docker-android:emulator_11.0
+    ```
+
 WSL2 Hardware acceleration (Windows 11 only)
 -----------
 

app.sh

@@ -48,13 +48,14 @@ else
 fi
 
 if [[ "${p}" == *"emulator"* ]]; then
-    supported_android_version=("9.0" "10.0" "11.0" "12.0" "13.0")
+    supported_android_version=("9.0" "10.0" "11.0" "12.0" "13.0" "14.0")
     declare -A api_levels=(
         ["9.0"]=28
         ["10.0"]=29
         ["11.0"]=30
         ["12.0"]=32
         ["13.0"]=33
+        ["14.0"]=34
     )
 
     # To get the last index

cli/requirements.txt

@@ -1,6 +1,6 @@
-autopep8==2.0.4
+autopep8==2.1.0
 click==8.1.7
-coverage==7.3.2
+coverage==7.5.0
 mock==5.1.0
 nose==1.3.7
 requests==2.31.0

cli/src/device/emulator.py

@@ -30,7 +30,8 @@ class Emulator(Device):
         "10.0": "29",
         "11.0": "30",
         "12.0": "32",
-        "13.0": "33"
+        "13.0": "33",
+        "14.0": "34"
     }
 
     adb_name_id = 5554
@@ -133,6 +134,10 @@ class Emulator(Device):
             self.logger.info(f"{self.device_type} is created!")
 
     def change_permission(self) -> None:
+        not_first_run = self.is_initialized()
+        if not_first_run:
+            return
+
         kvm_path = "/dev/kvm"
         if os.path.exists(kvm_path):
             cmds = (f"sudo chown 1300:1301 {kvm_path}",

docker/base

@@ -1,4 +1,4 @@
-FROM appium/appium:v2.2.2-p0
+FROM appium/appium:v2.5.4-p0
 
 LABEL maintainer "Budi Utomo <budtmo.os@gmail.com>"
 

docker/emulator

@@ -99,6 +99,8 @@ ENV LOG_PATH=${WORK_PATH}/logs \
     WEB_LOG_PORT=9000
 EXPOSE 9000
 RUN mkdir -p ${LOG_PATH}
+RUN mkdir -p "${WORK_PATH}/.config/Android Open Source Project" \
+ && echo "[General]\nshowNestedWarning=false\n" > "${WORK_PATH}/.config/Android Open Source Project/Emulator.conf"
 
 #=========
 # Run App

documentations/DOCKER-ANDROID-PRO.md

@@ -27,11 +27,13 @@ List of Docker-Images
 |11.0|30|Normal|budtmo2/docker-android-pro:emulator_11.0|budtmo2/docker-android-pro:emulator_11.0_<release_version>|
 |12.0|32|Normal|budtmo2/docker-android-pro:emulator_12.0|budtmo2/docker-android-pro:emulator_12.0_<release_version>|
 |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>|
 |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>|
 |12.0|32|Headless|budtmo2/docker-android-pro:emulator_headless_12.0|budtmo2/docker-android-pro:emulator_headless_12.0_<release_version>|
 |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>|
 |-|-|Selenium|budtmo2/docker-android-pro:selenium|budtmo2/docker-android-pro:selenium_<release_version>|
 
 ***Note: Headless mode does not have any Web-UI***