Merge pull request #558 from imikushin/test-custom-kernel

Test building with custom kernel and docker

scripts/ci

@@ -9,4 +9,4 @@ fi
 
 docker build -t ros-build-base -f Dockerfile.build-base .
 docker build -t ros-build -f Dockerfile.build .
-./scripts/docker-run.sh make -f Makefile.docker build-all integration-tests
+./scripts/docker-run.sh --name ros-ci make -f Makefile.docker build-all integration-tests

scripts/docker-run.sh

@@ -8,9 +8,32 @@ if [ -n "$BIND_DIR" ]; then
     fi
     DOCKER_ARGS="-t -v $BIND_DIR:/go/src/github.com/rancherio/os"
 fi
-if [ -c /dev/kvm ] || [ "${PRIVILEGED}" == "1" ]; then
-    DOCKER_ARGS="${DOCKER_ARGS} --privileged"
+if [ -c /dev/kvm ] || [ "${KVM}" == "1" ]; then
+    DOCKER_ARGS="${DOCKER_ARGS} --device=/dev/kvm:/dev/kvm"
 fi
 
-docker rm -fv ros-build >/dev/null 2>&1 || true
-exec docker run -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS --name=ros-build ros-build "$@"
+NAME=ros-build
+while [ "$#" -gt 0 ]; do
+    case $1 in
+        --name)
+            shift 1
+            NAME="$1"
+            ;;
+        --rm)
+            NAME=$(mktemp ${NAME}-XXXXXX)
+            rm $NAME
+            DOCKER_ARGS="${DOCKER_ARGS} --rm"
+            ;;
+        -t)
+            DOCKER_ARGS="${DOCKER_ARGS} -t"
+            ;;
+        *)
+            break
+            ;;
+    esac
+    shift 1
+done
+
+DOCKER_ARGS="${DOCKER_ARGS} --name=${NAME}"
+docker rm -fv ${NAME} >/dev/null 2>&1 || true
+exec docker run -i -v /var/run/docker.sock:/var/run/docker.sock $DOCKER_ARGS ros-build "$@"

scripts/installer/bootstrap

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get update 
-apt-get install -y grub2 parted

scripts/installer/lay-down-os

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e -x
 
-. $(dirname $0)/version
+. $(dirname $0)/build.conf
 VERSION=${VERSION:?"VERSION not set"}
 
 while getopts "i:f:c:d:t:r:o:p:" OPTION

scripts/version

@@ -1 +0,0 @@
-VERSION=v0.4.0-dev