diff --git a/Dockerfile b/Dockerfile index e6272ea..cfa57dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM datacatering/data-caterer-basic:0.11.2 -COPY --chown=app:app build/libs/data-caterer-example-0.1.0.jar /opt/spark/jars/data-caterer.jar +COPY --chown=app:app build/libs/data-caterer-example-0.1.0.jar /opt/app/job.jar diff --git a/benchmark/run_benchmark.sh b/benchmark/run_benchmark.sh index c19f4e7..2e8b23a 100755 --- a/benchmark/run_benchmark.sh +++ b/benchmark/run_benchmark.sh @@ -50,10 +50,10 @@ run_docker() { time_taken=$({ time -p docker run -p 4040:4040 \ - -v "$(pwd)/build/libs/data-caterer-example-0.1.0.jar:/opt/spark/jars/data-caterer.jar" \ - -v "$(pwd)/benchmark/jars/blaze.jar:/opt/spark/jars/blaze.jar" \ - -v "$(pwd)/benchmark/jars/comet.jar:/opt/spark/jars/comet.jar" \ - -v "$(pwd)/benchmark/jars/gluten.jar:/opt/spark/jars/gluten.jar" \ + -v "$(pwd)/build/libs/data-caterer-example-0.1.0.jar:/opt/app/job.jar" \ + -v "$(pwd)/benchmark/jars/blaze.jar:/opt/app/jars/blaze.jar" \ + -v "$(pwd)/benchmark/jars/comet.jar:/opt/app/jars/comet.jar" \ + -v "$(pwd)/benchmark/jars/gluten.jar:/opt/app/jars/gluten.jar" \ -v "/tmp:/opt/app/data" \ -e "PLAN_CLASS=$1" \ -e "RECORD_COUNT=$2" \ @@ -112,8 +112,10 @@ if [[ "$enable_data_sink_run" == true ]]; then done fi -echo "Printing logs of failed docker runs" -docker ps -a | grep -v "Exited (0)" | awk -F " " '{print $1}' | xargs docker logs +echo "Printing logs of last failed docker run" +docker ps -a | grep -v "Exited (0)" | awk -F " " '{print $1}' | tail -1 | xargs docker logs +echo "Printing logs of last docker run" +docker ps -a | awk -F " " '{print $1}' | tail -1 | xargs docker logs echo "Printing benchmark results" cat "$benchmark_result_file" diff --git a/run.sh b/run.sh index f455ae5..b20c87b 100755 --- a/run.sh +++ b/run.sh @@ -44,7 +44,7 @@ docker network create --driver bridge docker_default || true echo "Running Data Caterer via docker, version: $data_caterer_version" DOCKER_CMD=( docker run -p 4040:4040 - -v "$(pwd)/build/libs/data-caterer-example-0.1.0.jar:/opt/spark/jars/data-caterer.jar" + -v "$(pwd)/build/libs/data-caterer-example-0.1.0.jar:/opt/app/job.jar" -v "$(pwd)/docker/sample:/opt/app/data" -v "$(pwd)/docker/sample/tracking:/opt/app/record-tracking" -v "$(pwd)/docker/mount:/opt/app/mount"