[Notes] [Git][BuildStream/buildstream][master] 3 commits: contrib/bst-here: Change default image to buildstream/buildstream



Title: GitLab

Chandan Singh pushed to branch master at BuildStream / buildstream

Commits:

1 changed file:

Changes:

  • contrib/bst-here
    ... ... @@ -25,16 +25,22 @@
    25 25
     usage() {
    
    26 26
         cat <<EOF
    
    27 27
     
    
    28
    -USAGE: $(basename "$0") [-i BST_HERE_IMAGE] [-p] [-t] [-T] [-v VOLUME ...] [-h] [COMMAND [ARG..]]
    
    28
    +USAGE: $(basename "$0") [-i BST_HERE_IMAGE] [-j TAG] [-p] [-t] [-T] [-v VOLUME ...] [-h] [COMMAND [ARG..]]
    
    29 29
     
    
    30 30
     Run a bst command in a new BuildStream container.
    
    31 31
     
    
    32 32
     If no command is specified, an interactive shell is launched
    
    33 33
     using "/bin/bash -i".
    
    34 34
     
    
    35
    +See https://hub.docker.com/r/buildstream/buildstream for details on image
    
    36
    +variants.
    
    37
    +
    
    35 38
     OPTIONS:
    
    36 39
         -i IMAGE      Specify Docker image to use; can also be specified by setting
    
    37 40
                       BST_HERE_IMAGE environment variable.
    
    41
    +                  (default: buildstream/buildstream)
    
    42
    +    -j TAG        Specify the tag of the Docker image to use.
    
    43
    +                  (default: latest)
    
    38 44
         -p            Pull the latest buildstream image before running.
    
    39 45
         -t            Force pseudo-terminal allocation.
    
    40 46
         -T            Disable pseudo-terminal allocation.
    
    ... ... @@ -46,7 +52,8 @@ EOF
    46 52
         exit "$1"
    
    47 53
     }
    
    48 54
     
    
    49
    -bst_here_image="${BST_HERE_IMAGE:-buildstream/buildstream-fedora:latest}"
    
    55
    +bst_here_image="${BST_HERE_IMAGE:-buildstream/buildstream}"
    
    56
    +bst_here_tag=
    
    50 57
     
    
    51 58
     is_tty=
    
    52 59
     update=false
    
    ... ... @@ -57,12 +64,15 @@ then
    57 64
         is_tty=y
    
    58 65
     fi
    
    59 66
     
    
    60
    -while getopts i:ptTv:h arg
    
    67
    +while getopts i:j:ptTv:h arg
    
    61 68
     do
    
    62 69
         case $arg in
    
    63 70
         i)
    
    64 71
             bst_here_image="$OPTARG"
    
    65 72
             ;;
    
    73
    +    j)
    
    74
    +        bst_here_tag="$OPTARG"
    
    75
    +        ;;
    
    66 76
         p)
    
    67 77
             update=true
    
    68 78
             ;;
    
    ... ... @@ -83,6 +93,10 @@ do
    83 93
         esac
    
    84 94
     done
    
    85 95
     
    
    96
    +if [ -n "$bst_here_tag" ]; then
    
    97
    +    bst_here_image="$bst_here_image:$bst_here_tag"
    
    98
    +fi
    
    99
    +
    
    86 100
     test "$OPTIND" -gt 1 &&
    
    87 101
         shift $(( OPTIND - 1 ))
    
    88 102
     
    



  • [Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]