Adding Prometheus Mysqld Exporter Charm

[osm/devops.git] / jenkins / host / start_build

diff --git a/jenkins/host/start_build b/jenkins/host/start_build
index 45d495f..f7ada68 100755 (executable)
--- a/jenkins/host/start_build
+++ b/jenkins/host/start_build
@@ -30,17 +30,25 @@ export OSM_MDG=$1
 shift
 OSM_load_config
 
+if [ "$1" = "--build-container" ]; then
+    shift
+    [ $# -lt 1 ] && FATAL "missing container name with option --build-container"
+    export OSM_BUILD_CONTAINER=$1
+    shift
+fi
+
 if ! container_exists $OSM_BUILD_CONTAINER; then
        CONTAINER_OPTS=""
        [[ "$OSM_BUILD_CONTAINER_PRIVILEGED" == yes ]] && CONTAINER_OPTS="$CONTAINER_OPTS -c security.privileged=true"
        [[ "$OSM_BUILD_CONTAINER_ALLOW_NESTED" == yes ]] && CONTAINER_OPTS="$CONTAINER_OPTS -c security.nesting=true"
+       [[ "$OSM_BUILD_CONTAINER_ALLOW_DOCKER" == yes ]] && CONTAINER_OPTS="$CONTAINER_OPTS -p docker -p default"
        create_container $OSM_BASE_IMAGE $OSM_BUILD_CONTAINER $CONTAINER_OPTS
        wait_container_up $OSM_BUILD_CONTAINER
        RE="fedora|fc[0-9]"
        if [[ $OSM_BASE_IMAGE =~ $RE ]]; then
                container_exec $OSM_BUILD_CONTAINER yum -y install git tar make sudo
        else
-               container_exec $OSM_BUILD_CONTAINER apt -y install git realpath make sudo 
+               container_exec $OSM_BUILD_CONTAINER apt-get -y install git realpath make sudo 
        fi
        if [ ${OSM_USE_LOCAL_DEVOPS:-false} ]; then
                container_push_devops $OSM_BUILD_CONTAINER