airship
/
shipyard
Code Issues Proposed changes

Merge "Updates to shipyard cli wrapper"

changes/35/569835/9
Zuul 2018-06-13 21:48:13 +00:00 committed by Gerrit Code Review
parent 16942212fa bf22828f52
commit ea47f2c77b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/run_shipyard.sh
View File

@ -31,8 +31,8 @@ set -ex
# Get the path of the directory where the script is located
# Source Base Docker Command
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR} && source shipyard_docker_base_command.sh
DIR="$(realpath $(dirname "${BASH_SOURCE}"))"
source "${DIR}/shipyard_docker_base_command.sh"
# Execute Shipyard CLI
#

2
tools/shipyard_docker_base_command.sh
View File

@ -19,7 +19,7 @@
# before executing this script if they differ from the default values.
#
NAMESPACE="${NAMESPACE:-ucp}"
SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/attcomdev/shipyard:latest}"
SHIPYARD_IMAGE="${SHIPYARD_IMAGE:-quay.io/airshipit/shipyard:master}"
# Define Base Docker Command
base_docker_command=$(cat << EndOfCommand