balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Alphanet: fixes container: relative paths bug

Browse Source
This commit is contained in:
Milo Davis 2017-08-21 14:58:31 +02:00 committed by Grégoire Henry
parent 5bf5f09fbc
commit 8c9f5f21a5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/alphanet.sh
View File

@ -18,7 +18,8 @@ else
docker_1_13=false docker_1_13=false
fi fi
src_dir="$(cd "$(dirname "$0")" && echo "$(pwd -P)/")" current_dir="$(pwd -P)"
src_dir="$(cd "$(dirname "$0")" && echo "$current_dir/")"
cd "$src_dir" cd "$src_dir"
default_port=9732 default_port=9732
@ -31,7 +32,7 @@ suffix=
data_dir="$HOME/.tezos-alphanet$suffix" data_dir="$HOME/.tezos-alphanet$suffix"
docker_container="tezos-alphanet$suffix" docker_container="tezos-alphanet$suffix"
if [ $ALPHANET_EMACS ]; then if [ ! -z "$ALPHANET_EMACS" ]; then
interactive_flags="-t" interactive_flags="-t"
else else
interactive_flags="-it" interactive_flags="-it"
@ -175,7 +176,7 @@ start_container() {
assert_container_uptodate assert_container_uptodate
else else
if ! check_volume; then if ! check_volume; then
docker volume create $docker_volume docker volume create "$docker_volume"
fi fi
docker rm "$docker_container" || true > /dev/null 2>&1 docker rm "$docker_container" || true > /dev/null 2>&1
echo "Launching the docker container..." echo "Launching the docker container..."
@ -338,13 +339,16 @@ run_client() {
declare -a container_args=(); declare -a container_args=();
for arg in "$@"; do for arg in "$@"; do
if [[ "$arg" == 'container:'* ]]; then if [[ "$arg" == 'container:'* ]]; then
local_path=${arg#container:} local_path="${arg#container:}"
if [[ "$local_path" != '/'* ]]; then
local_path="$current_dir/$local_path"
fi
docker exec "$docker_container" mkdir -p -m 777 /tmp/copied/ docker exec "$docker_container" mkdir -p -m 777 /tmp/copied/
file_name=$(basename "${local_path}") file_name=$(basename "${local_path}")
docker_path="/tmp/copied/$file_name" docker_path="/tmp/copied/$file_name"
docker cp "${local_path}" "$docker_container:${docker_path}" docker cp "${local_path}" "$docker_container:${docker_path}"
docker exec "$docker_container" sudo chmod 644 "${docker_path}" docker exec "$docker_container" sudo chmod 644 "${docker_path}"
container_args+=($docker_path); container_args+=("file:$docker_path");
else else
container_args+=(${arg}); container_args+=(${arg});
fi fi