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

Cleaned up Dockerfile

Browse source
This commit is contained in:
butomo1989 2018-06-25 22:54:01 +02:00
parent 0af1143e72
commit b4544ae90f
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
docker/Genymotion
View file

@ -17,6 +17,11 @@ WORKDIR /root
# socat # socat
# Port forwarder # Port forwarder
#------------------ #------------------
# Genymotion spec
#------------------
# bzip2
# File compression
#------------------
# NoVNC Packages # NoVNC Packages
#------------------ #------------------
# x11vnc # x11vnc
@ -41,6 +46,7 @@ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \
xterm \ xterm \
supervisor \ supervisor \
socat \ socat \
bzip2 \
x11vnc \ x11vnc \
openbox \ openbox \
menu \ menu \
@ -85,17 +91,17 @@ ENV DISPLAY=:0 \
#==================== #====================
# Install genymotion # Install genymotion
#==================== #====================
ENV GENYMOTION_VERSION=2.12.1 \ ARG GENYMOTION_VERSION=2.12.1
PATH="${PATH}:/root/genymotion"
COPY genymotion/${GENYMOTION_VERSION}/genymotion /root/genymotion
#======================= ENV GENYMOTION=true \
# Set default variables GENYMOTION_VERSION=$GENYMOTION_VERSION \
#======================= PATH="${PATH}:/opt/genymobile/genymotion/" \
ENV APPIUM_LOG=$LOG_PATH/appium.log APPIUM_LOG=$LOG_PATH/appium.log
ENV GENYMOTION=true RUN wget -nv -O genymotion.bin "https://dl.genymotion.com/releases/genymotion-${GENYMOTION_VERSION}/genymotion-${GENYMOTION_VERSION}-linux_x64.bin" \
COPY genymotion/generate_config.sh /root && chmod +x ./genymotion.bin \
RUN chmod +x /root/generate_config.sh && yes | ./genymotion.bin \
&& rm genymotion.bin
COPY genymotion/generate_config.sh genymotion/geny_start.sh /root/
#=============== #===============
# Expose Ports # Expose Ports
@ -114,8 +120,5 @@ EXPOSE 4723 6080 5555
#======================= #=======================
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 /root/geny_start.sh
COPY genymotion/geny_start.sh /root
RUN chmod +x /root/geny_start.sh
CMD ["./geny_start.sh"] CMD ["./geny_start.sh"]