From 04c458e4581f3a941fba5ad8797e07c2e3019e81 Mon Sep 17 00:00:00 2001
From: Gjorgji Kjosev <gorgi.kosev@gmail.com>
Date: Sun, 18 Aug 2024 13:12:54 +0100
Subject: [PATCH] chore: cleanup

---
 .github/workflows/ccpp.yml                |  4 +++-
 docker/Dockerfile                         | 25 ++++++++++-------------
 docker/run-test.sh                        | 12 +++++++++++
 docker/run-docker-test.sh => tests/run.sh |  1 -
 4 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 docker/run-test.sh
 rename docker/run-docker-test.sh => tests/run.sh (98%)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 1bedf85..5b04dff 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -43,7 +43,9 @@ jobs:
       uses: reactivecircus/android-emulator-runner@v2
       with:
         api-level: 29
-        script: sudo ./docker/run-docker-test.sh
+        script: |
+          export PATH=/usr/local/lib/android/sdk/platform-tools:$PATH
+          sudo ./tests/run.sh
     # services:
       # emulator:
         # image: budtmo/docker-android:emulator_12.0
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cb66373..4f537a7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 as buildenv
+FROM ubuntu:latest as buildenv
 RUN apt update
 RUN apt install -y build-essential git pkg-config
 RUN apt install -y libfuse-dev fuse
@@ -7,25 +7,22 @@ WORKDIR /src
 RUN make
 
 
-FROM budtmo/docker-android-x86-10.0
-RUN apt update
+FROM us-docker.pkg.dev/android-emulator-268719/images/30-google-x64:30.1.2
+# FROM docker.io/budtmo/docker-android:emulator_12.0
+# RUN apt update
 
-RUN apt install -y fuse libfuse-dev
+# RUN apt install -y fuse libfuse-dev
 
-ADD ./* /src/
+# ADD ./* /src/
+ADD ./tests/* /src/tests/
 ADD ./docker/* /src/docker/
 
-RUN chmod +x /src/docker/run-docker-test.sh
+RUN chmod +x /src/docker/*.sh
 
 COPY --from=buildenv /src/adbfs /usr/bin/adbfs
 RUN chmod +x /usr/bin/adbfs
 
 WORKDIR /src
-CMD /src/docker/run-docker-test.sh
-
-
-
-
-
-
-
+# CMD /src/docker/run-docker-test.sh
+ENTRYPOINT [ "sudo", "bash", "/src/docker/run-test.sh" ]
+# ENTRYPOINT [ "bash" ]
\ No newline at end of file
diff --git a/docker/run-test.sh b/docker/run-test.sh
new file mode 100644
index 0000000..7cdf022
--- /dev/null
+++ b/docker/run-test.sh
@@ -0,0 +1,12 @@
+
+export SCRIPT_PATH="docker-android"
+export WORK_PATH="/home/androidusr"
+export APP_PATH=${WORK_PATH}/${SCRIPT_PATH}
+export LOG_PATH=${WORK_PATH}/logs
+export SUPERVISORD_CONFIG_PATH="${APP_PATH}/mixins/configs/process"
+export DEVICE_TYPE=emulator
+
+/usr/bin/supervisord --configuration ${SUPERVISORD_CONFIG_PATH}/supervisord-port.conf & \
+/usr/bin/supervisord --configuration ${SUPERVISORD_CONFIG_PATH}/supervisord-base.conf & \
+
+bash $(dirname $0)/../tests/run.sh
\ No newline at end of file
diff --git a/docker/run-docker-test.sh b/tests/run.sh
similarity index 98%
rename from docker/run-docker-test.sh
rename to tests/run.sh
index 6a0c4bd..3fb6164 100755
--- a/docker/run-docker-test.sh
+++ b/tests/run.sh
@@ -9,7 +9,6 @@
 
 WAIT_TIME=60
 
-export PATH=/usr/local/lib/android/sdk/platform-tools:$PATH
 
 wait_available() {