From 83300a3da3bf98a992dd724ea73b113e93023c59 Mon Sep 17 00:00:00 2001 From: "Anderson, Craig (ca846m)" Date: Fri, 22 Jun 2018 15:56:59 -0700 Subject: [PATCH] Simplify pegleg.sh usage Remove unused code. Set WORKSPACE default to $PWD and set workdir in the container, so that users of pegleg.sh do not need to have any knowledge of the internal "/worksapce" mountpath inside the container, and in general simplify the execution of container command line tools. Change-Id: I56dea7d116f88df303aaeca8dc25a7b24cb291a6 --- tools/pegleg.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/tools/pegleg.sh b/tools/pegleg.sh index 8fceda37..4e92f810 100755 --- a/tools/pegleg.sh +++ b/tools/pegleg.sh @@ -2,24 +2,20 @@ set -e -realpath() { - [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}" -} - -SCRIPT_DIR=$(realpath "$(dirname "${0}")") -SOURCE_DIR=${SCRIPT_DIR}/pegleg -if [ -z "${WORKSPACE}" ]; then - WORKSPACE="/" -fi - -IMAGE=${IMAGE:-artifacts-aic.atlantafoundry.com/att-comdev/pegleg:latest} +: ${WORKSPACE:=$(pwd)} +: ${IMAGE:=artifacts-aic.atlantafoundry.com/att-comdev/pegleg:latest} echo -echo "== NOTE: Workspace $WORKSPACE is available as /workspace in container context ==" +echo "== NOTE: Workspace $WORKSPACE is the execution directory in the container ==" echo +# Working directory inside container to execute commands from and mount from +# host OS +container_workspace_path='/workspace' + docker run --rm -t \ --net=none \ - -v "${WORKSPACE}:/workspace" \ + --workdir="$container_workspace_path" \ + -v "${WORKSPACE}:$container_workspace_path" \ "${IMAGE}" \ pegleg "${@}"