scott/docker-android
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Using scrcpy instead of asm (#188)

Browse source
This commit is contained in:
Arne 2019-09-06 14:11:06 +02:00 committed by Budi Utomo
parent 377cb04ca1
commit 120d80f0ab
4 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
docker/Real_device
View file

@ -69,9 +69,38 @@ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \
net-tools \ net-tools \
ffmpeg \ ffmpeg \
jq \ jq \
curl \
libavcodec-dev \
libavformat-dev \
libavutil-dev \
gcc \
git \
make \
meson \
musl-dev \
pkgconf \
libsdl2-dev \
&& apt clean all \ && apt clean all \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
#===========
# scrcpy - screen copy
# https://github.com/Genymobile/scrcpy
#===========
ARG SCRCPY_VER=1.10
ARG SERVER_HASH="cbeb1a4e046f1392c1dc73c3ccffd7f86dec4636b505556ea20929687a119390"
RUN mkdir /root/scrcpy
RUN curl -L -o /root/scrcpy/scrcpy-code.zip https://github.com/Genymobile/scrcpy/archive/v${SCRCPY_VER}.zip
RUN curl -L -o /root/scrcpy/scrcpy-server.jar https://github.com/Genymobile/scrcpy/releases/download/v${SCRCPY_VER}/scrcpy-server-v${SCRCPY_VER}.jar
RUN echo "$SERVER_HASH scrcpy/scrcpy-server.jar" | sha256sum -c -
RUN cd scrcpy && unzip -x scrcpy-code.zip
RUN cd scrcpy/scrcpy-${SCRCPY_VER} && meson x --buildtype release --strip -Db_lto=true -Dprebuilt_server=/root/scrcpy/scrcpy-server.jar
RUN cd scrcpy/scrcpy-${SCRCPY_VER}/x && ninja && ninja install
RUN rm -rf scrcpy/
#=========== #===========
# Polyverse # Polyverse
# https://polyverse.io/how-it-works/ # https://polyverse.io/how-it-works/
@ -156,7 +185,6 @@ EXPOSE 4723 6080 5555
#=================== #===================
# Run docker-appium # Run docker-appium
#=================== #===================
COPY sm/asm.jar /root/
COPY src /root/src COPY src /root/src
COPY supervisord.conf /root/ COPY supervisord.conf /root/
RUN chmod -R +x /root/src && chmod +x /root/supervisord.conf RUN chmod -R +x /root/src && chmod +x /root/supervisord.conf

BIN
sm/asm.jar
View file

Binary file not shown.

4
src/asm.sh → src/scrcpy.sh
View file

@ -3,6 +3,6 @@
if [ -z "$REAL_DEVICE"]; then if [ -z "$REAL_DEVICE"]; then
echo "Container is using android emulator" echo "Container is using android emulator"
else else
echo "Starting android screen mirror..." echo "Starting android screen copy..."
java -jar /root/asm.jar $ANDROID_HOME /usr/local/bin/scrcpy
fi fi

10
supervisord.conf
View file

@ -35,12 +35,12 @@ autorestart=false
priority=1 priority=1
;startsecs to fix "not expected" error. see: https://github.com/Supervisor/supervisor/issues/212#issuecomment-47933372 ;startsecs to fix "not expected" error. see: https://github.com/Supervisor/supervisor/issues/212#issuecomment-47933372
[program:android-screen-mirror] [program:screen-copy]
command=./src/asm.sh command=./src/scrcpy.sh
autorestart=false autorestart=true
startsecs=0 startsecs=0
stdout_logfile=%(ENV_LOG_PATH)s/android-screen-mirror.stdout.log stdout_logfile=%(ENV_LOG_PATH)s/screen-copy.stdout.log
stderr_logfile=%(ENV_LOG_PATH)s/android-screen-mirror.stderr.log stderr_logfile=%(ENV_LOG_PATH)s/screen-copy.stderr.log
priority=3 priority=3
[program:atd] [program:atd]