Cleaned up Dockerfile

This commit is contained in:
butomo1989 2018-06-25 22:54:01 +02:00
parent 0af1143e72
commit b4544ae90f

View file

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