Updates to shipyard cli wrapper

- Don't change directory so that the volume mounted in the
  container at /home/shipayard/host is predictable
- Update image default to point at airshipit repo

Change-Id: If8b0988925921d7b54ec74ac73e12289d89d392e
This commit is contained in:
Scott Hussey 2018-06-12 16:06:02 -05:00
parent 748d0fcd53
commit bf22828f52
2 changed files with 3 additions and 3 deletions

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
#

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