X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=jenkins%2Fhost%2Fstart_build;h=f7ada68a35ebc54fa7598703fefa7c87af86248e;hb=9054244cd2a7451f75157d7fa3ec5d2ff88176be;hp=45d495f2a052e2b60413238be48b32eaaacadcc9;hpb=db26f3c90d0139edd02bf06c7689f94259f57513;p=osm%2Fdevops.git diff --git a/jenkins/host/start_build b/jenkins/host/start_build index 45d495f2..f7ada68a 100755 --- 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