X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fdocker-get-container-tag.sh;h=df3f8ce435ad44ac39f905379cf4b8034a48eab7;hb=ae55fc7cc2d4d29f6cfe63f5294ec8bd97d15479;hp=e522e220045bb27f75b57d5ee63b576acea4c384;hpb=6c76914981c2b40419447ca692fd4e10424a09ef;p=releng%2Fglobal-jjb.git

diff --git a/shell/docker-get-container-tag.sh b/shell/docker-get-container-tag.sh
index e522e220..df3f8ce4 100644
--- a/shell/docker-get-container-tag.sh
+++ b/shell/docker-get-container-tag.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2019 The Linux Foundation and others.
@@ -8,10 +8,13 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+
 echo "---> docker-get-container-tag.sh"
+
 # Gets the container tag per $CONTAINER_TAG_METHOD
 # For YAML file use directory $CONTAINER_TAG_YAML_DIR
-# if value is provided, else fall back to $DOCKER_ROOT
+# if a value is provided, else fall back to $DOCKER_ROOT
+# use login flag to get $HOME/.local/bin in PATH
 
 set -feu -o pipefail
 
@@ -21,11 +24,11 @@ if [[ $CONTAINER_TAG_METHOD == "latest" ]]; then
 elif [[ $CONTAINER_TAG_METHOD == "git-describe" ]]; then
     tag=$(git describe)
 elif [[ $CONTAINER_TAG_METHOD == "yaml-file" ]]; then
-    # TODO: set default value in JJB?
     dir=${CONTAINER_TAG_YAML_DIR:-$DOCKER_ROOT}
     tag_file=$dir/container-tag.yaml
     if [[ -f $tag_file ]]; then
-        tag=$(yq -r .tag tag_file)
+        # pip installs yq to $HOME/.local/bin
+        tag=$(yq -r .tag "$tag_file")
     else
         echo "File $tag_file not found."
     fi