diff options
| -rwxr-xr-x | scripts/command/change_gitmodule.sh | 2 | ||||
| -rwxr-xr-x | scripts/command/docker_build_ubuntu_svace.sh | 2 | ||||
| -rwxr-xr-x | scripts/command/docker_cross_test_coverage_build.sh | 2 | ||||
| -rwxr-xr-x | scripts/command/docker_run_test.sh | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scripts/command/change_gitmodule.sh b/scripts/command/change_gitmodule.sh index 3ffcce2e3..8e16ac81c 100755 --- a/scripts/command/change_gitmodule.sh +++ b/scripts/command/change_gitmodule.sh @@ -13,7 +13,7 @@ # somewhere, we decided to use a token-based authentication method. SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -HOST_HOME=$SCRIPT_ROOT/../ +HOST_HOME=$SCRIPT_ROOT/../.. USERNAME=git-bot-sec TOKEN=acb137d756874f7c7746a95e31ebb3994f1c4505 diff --git a/scripts/command/docker_build_ubuntu_svace.sh b/scripts/command/docker_build_ubuntu_svace.sh index 48d3350ef..8a95992d9 100755 --- a/scripts/command/docker_build_ubuntu_svace.sh +++ b/scripts/command/docker_build_ubuntu_svace.sh @@ -56,7 +56,7 @@ DOCKER_VOLUMES+=" -v $TMP_DIR/arm:/opt/rootfs" DOCKER_VOLUMES+=" -v $TMP_DIR/libarmcl:/opt/libarmcl" # Change .gitmodules to work around the permission issue -CMD_SUBMODULE="docker/change_gitmodule.sh" +CMD_SUBMODULE="./scripts/command/change_gitmodule.sh" docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD_SUBMODULE" if [ -n "$DOCKER_INTERACTIVE" ]; then diff --git a/scripts/command/docker_cross_test_coverage_build.sh b/scripts/command/docker_cross_test_coverage_build.sh index 9f8997062..fa8c4f525 100755 --- a/scripts/command/docker_cross_test_coverage_build.sh +++ b/scripts/command/docker_cross_test_coverage_build.sh @@ -40,7 +40,7 @@ DOCKER_VOLUMES+=" -v $TMP_DIR/arm:/opt/rootfs" DOCKER_VOLUMES+=" -v $TMP_DIR/libarmcl:/opt/libarmcl" # Change .gitmodules to work around the permission issue -CMD_SUBMODULE="docker/change_gitmodule.sh" +CMD_SUBMODULE="./scripts/command/change_gitmodule.sh" docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD_SUBMODULE" if [ -n "$DOCKER_INTERACTIVE" ]; then diff --git a/scripts/command/docker_run_test.sh b/scripts/command/docker_run_test.sh index 208c63ae6..a3560e822 100755 --- a/scripts/command/docker_run_test.sh +++ b/scripts/command/docker_run_test.sh @@ -9,7 +9,7 @@ if [ -z "`docker images | grep $DOCKER_IMAGE_NAME`" ]; then exit 1 fi -HOST_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )" +HOST_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )" DOCKER_PATH=/home/npuci/nnfw @@ -33,7 +33,7 @@ if [ "$DOCKER_INTERACTIVE" ]; then fi # Change .gitmodules to work around the permission issue -CMD_SUBMODULE="docker/change_gitmodule.sh" +CMD_SUBMODULE="./scripts/command/change_gitmodule.sh" docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD_SUBMODULE docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME $CMD |