Merge pull request #47 from cyplo/docker_image

Introduce custom base system docker images to speed up builds

.travis.yml

@@ -5,8 +5,8 @@ script:
     - ./test 
 
 env:
-    - DETECTED_OS=fedora:24
+    - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base
-    - DETECTED_OS=debian:jessie NOUPGRADE=true
+    - DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
     - DETECTED_OS=ubuntu:trusty
     - DETECTED_OS=ubuntu:xenial
 

debian/configure_fresh_system

@@ -29,7 +29,8 @@ echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /
 echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
 sudo apt-get update
 sudo apt-get -y install mono-devel mono-complete 
-# install vim from sources
+
+if [[ -z $NO_COMPILE_VIM ]]; then
     VIM_BUILD_DIR=/tmp
     cd "$VIM_BUILD_DIR"
     git clone https://github.com/vim/vim.git
@@ -37,18 +38,17 @@ cd vim
     ./configure --with-features=huge \
                 --enable-multibyte \
                 --enable-rubyinterp \
-            --enable-pythoninterp \
+                --enable-python3interp=yes \
-            --with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
-            --enable-perlinterp \
                 --enable-luainterp \
-            --enable-gui=gtk2 --enable-cscope --prefix=/usr
+                --enable-gui=no \
+                --enable-cscope 
     make -j2
     sudo make install
     cd
     rm -fvr "$VIM_BUILD_DIR/vim"
+fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system
 
-

debian/test_insider

@@ -5,6 +5,7 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
 export NO_SYSTEMCTL=true
+export NO_COMPILE_VIM=true
 
 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries
 

fedora/Dockerfile

@@ -0,0 +1,20 @@
+FROM fedora:24
+
+RUN dnf -y install sudo
+RUN sudo dnf -y upgrade --best --allowerasing
+RUN sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel zeal
+
+RUN sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-24.noarch.rpm
+RUN sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-24.noarch.rpm
+RUN sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp mono-devel keepass mplayer golang ncurses-compat-libs kicad retext
+RUN sudo dnf -y groupinstall "C Development Tools and Libraries"
+RUN sudo dnf -y groupinstall "Development Tools"
+
+RUN git clone https://github.com/vim/vim.git /tmp/vim
+RUN cd /tmp/vim && ./configure --with-features=huge \
+            --enable-multibyte \
+            --enable-rubyinterp \
+            --enable-python3interp=yes \
+            --enable-luainterp \
+            --enable-gui=no \
+            --enable-cscope && make -j2 && sudo make install

fedora/configure_fresh_system

@@ -25,6 +25,7 @@ if [[ -z $NO_SYSTEMCTL ]]; then
     sudo systemctl list-timers "*dnf-*"
 fi
 
+if [[ -z $NO_COMPILE_VIM ]]; then
     VIM_BUILD_DIR=/tmp
     cd "$VIM_BUILD_DIR"
     git clone https://github.com/vim/vim.git
@@ -40,6 +41,7 @@ make -j2
     sudo make install
     cd
     rm -fvr "$VIM_BUILD_DIR/vim"
+fi
 
 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system

fedora/test_insider

@@ -4,6 +4,7 @@ set -e
 
 export DONT_CHANGE_SHELL=true
 export NO_SYSTEMCTL=true
+export NO_COMPILE_VIM=true
 
 dnf -y install sudo
 

test

@@ -25,5 +25,9 @@ else
     DIR=$SYSTEM_DIR
 fi
 
-docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider
+if [[ -z $DOCKER_IMAGE ]]; then
+    DOCKER_IMAGE="$DETECTED_OS"
+fi
+
+docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DOCKER_IMAGE $INSIDER_ROOT_DIR/$DIR/test_insider