diff --git a/docker/Emulator_x86 b/docker/Emulator_x86 index 6377de9..2a6c040 100644 --- a/docker/Emulator_x86 +++ b/docker/Emulator_x86 @@ -1,4 +1,4 @@ -FROM appium/appium:1.14.0-p0 +FROM appium/appium:1.13.0-p0 LABEL maintainer "Budi Utomo " @@ -38,8 +38,6 @@ RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \ # Windows manager # feh # ScreenBackground -# python-xdg -# Required by openbox autostart function # menu # Debian menu # python-numpy @@ -63,8 +61,8 @@ RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \ # ubuntu-vm-builder # bridge-utils #================== -ADD src/sources1810.list /etc/apt/sources.list.d/ -ADD src/x11vnc.pref /etc/apt/preferences.d/ +ADD docker/configs/sources1810.list /etc/apt/sources.list.d/ +ADD docker/configs/x11vnc.pref /etc/apt/preferences.d/ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \ xterm \ supervisor \ @@ -72,7 +70,6 @@ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \ x11vnc \ openbox \ feh \ - python-xdg \ menu \ python-numpy \ net-tools \ @@ -171,9 +168,9 @@ ENV DISPLAY=:0 \ # + Add background #================================================ ADD images/logo_dockerandroid_small.png /root/logo.png -ADD src/.fehbg /root/.fehbg +ADD docker/configs/.fehbg RUN sed -i "s/4<\/number>/1<\/number>/g" /etc/xdg/openbox/rc.xml \ - && echo /root/.fehbg >> /etc/xdg/openbox/autostart + && echo 'eval `cat $HOME/.fehbg` &' >> /etc/xdg/openbox/autostart #=============== # Expose Ports diff --git a/docker/Genymotion b/docker/Genymotion index cc82c0a..35e4192 100644 --- a/docker/Genymotion +++ b/docker/Genymotion @@ -47,6 +47,10 @@ RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \ # We use package from ubuntu 18.10 to fix crashing issue # openbox # Windows manager +# feh +# ScreenBackground +# python-xdg +# Required by openbox autostart function # menu # Debian menu # python-numpy @@ -61,8 +65,8 @@ RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \ # jq # Sed for JSON data #================== -ADD src/sources1810.list /etc/apt/sources.list.d/ -ADD src/x11vnc.pref /etc/apt/preferences.d/ +ADD docker/configs/sources1810.list /etc/apt/sources.list.d/ +ADD docker/configs/x11vnc.pref /etc/apt/preferences.d/ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \ xterm \ supervisor \ @@ -73,6 +77,8 @@ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \ python3-pip \ x11vnc \ openbox \ + feh \ + python-xdg \ menu \ python-numpy \ net-tools \ @@ -124,8 +130,12 @@ ENV DISPLAY=:0 \ # openbox configuration # Update the openbox configuration files to: # + Use a single virtual desktop to prevent accidentally switching +# + Add background #================================================ -RUN sed -i "s/4<\/number>/1<\/number>/g" /etc/xdg/openbox/rc.xml +ADD images/logo_dockerandroid_small.png /root/logo.png +ADD docker/configs/.fehbg +RUN sed -i "s/4<\/number>/1<\/number>/g" /etc/xdg/openbox/rc.xml \ + && echo 'eval `cat $HOME/.fehbg` &' >> /etc/xdg/openbox/autostart #============ # Set Locale diff --git a/docker/Real_device b/docker/Real_device index 1e93c5b..7261441 100644 --- a/docker/Real_device +++ b/docker/Real_device @@ -36,6 +36,10 @@ RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \ # We use package from ubuntu 18.10 to fix crashing issue # openbox # Windows manager +# feh +# ScreenBackground +# python-xdg +# Required by openbox autostart function # menu # Debian menu # python-numpy @@ -50,14 +54,16 @@ RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \ # jq # Sed for JSON data #================== -ADD src/sources1810.list /etc/apt/sources.list.d/ -ADD src/x11vnc.pref /etc/apt/preferences.d/ +ADD docker/configs/sources1810.list /etc/apt/sources.list.d/ +ADD docker/configs/x11vnc.pref /etc/apt/preferences.d/ RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \ xterm \ supervisor \ socat \ x11vnc \ openbox \ + feh \ + python-xdg \ menu \ python-numpy \ net-tools \ @@ -121,8 +127,12 @@ ENV DISPLAY=:0 \ # openbox configuration # Update the openbox configuration files to: # + Use a single virtual desktop to prevent accidentally switching +# + Add background #================================================ -RUN sed -i "s/4<\/number>/1<\/number>/g" /etc/xdg/openbox/rc.xml +ADD images/logo_dockerandroid_small.png /root/logo.png +ADD docker/configs/.fehbg +RUN sed -i "s/4<\/number>/1<\/number>/g" /etc/xdg/openbox/rc.xml \ + && echo 'eval `cat $HOME/.fehbg` &' >> /etc/xdg/openbox/autostart #========================= # Set default variables diff --git a/src/sources1810.list b/src/sources1810.list deleted file mode 100644 index e64c003..0000000 --- a/src/sources1810.list +++ /dev/null @@ -1,2 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ cosmic main restricted universe -deb http://security.ubuntu.com/ubuntu/ cosmic-security main restricted universe diff --git a/src/x11vnc.pref b/src/x11vnc.pref deleted file mode 100644 index 67a022f..0000000 --- a/src/x11vnc.pref +++ /dev/null @@ -1,6 +0,0 @@ -Package: * -Pin: release n=bionic -Pin-Priority: -10 -Package: x11vnc* -Pin: release n=cosmic -Pin-Priority: 500 \ No newline at end of file