Skip to content
This repository was archived by the owner on Aug 16, 2021. It is now read-only.

Commit 801d619

Browse files
committed
use docker cp
1 parent 8e53e91 commit 801d619

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

nancy_run.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,9 @@ function copyFile() {
627627
docker_exec s3cmd sync $1 $MACHINE_HOME/
628628
else
629629
if [ "$RUN_ON" = "localhost" ]; then
630-
ln ${1/file:\/\//} "$TMP_PATH/nancy_$containerHash/" # TODO: option – hard links OR regular `cp`
630+
#ln ${1/file:\/\//} "$TMP_PATH/nancy_$containerHash/"
631+
# TODO: option – hard links OR regular `cp`
632+
docker cp ${1/file:\/\//} $containerHash:$MACHINE_HOME/
631633
elif [ "$RUN_ON" = "aws" ]; then
632634
docker-machine scp $1 $DOCKER_MACHINE:/home/ubuntu
633635
else
@@ -726,8 +728,11 @@ else
726728
)
727729
docker_exec bash -c "gzip -c $logpath > $MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz"
728730
if [ "$RUN_ON" = "localhost" ]; then
729-
cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
730-
cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
731+
docker cp $containerHash:$MACHINE_HOME/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
732+
docker cp $containerHash:$MACHINE_HOME/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
733+
# TODO option: ln / cp
734+
#cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
735+
#cp "$TMP_PATH/nancy_$containerHash/"$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/
731736
elif [ "$RUN_ON" = "aws" ]; then
732737
docker-machine scp $DOCKER_MACHINE:/home/ubuntu/$ARTIFACTS_FILENAME.json $ARTIFACTS_DESTINATION/
733738
docker-machine scp $DOCKER_MACHINE:/home/ubuntu/$ARTIFACTS_FILENAME.log.gz $ARTIFACTS_DESTINATION/

0 commit comments

Comments
 (0)