Skip to content

Commit 7efa20e

Browse files
authored
Make docker compose scripts runnable from any directory (#276)
Move into the script directory first so we can execute these from any directory.
1 parent 0e355e4 commit 7efa20e

File tree

14 files changed

+64
-16
lines changed

14 files changed

+64
-16
lines changed

docker/build-run-benchmark-with-docker.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ if [ ! -x "docker/${BENCHBASE_PROFILE}-latest/up.sh" ]; then
2121
echo "ERROR: No docker up.sh script available for '$BENCHBASE_PROFILE'"
2222
fi
2323

24-
pushd "docker/${BENCHBASE_PROFILE}-latest"
25-
./up.sh
26-
popd
24+
"./docker/${BENCHBASE_PROFILE}-latest/up.sh"
2725

2826
SKIP_TESTS=${SKIP_TESTS:-true} EXTRA_DOCKER_ARGS="--network=host" \
2927
./docker/benchbase/run-full-image.sh \
3028
--config "config/sample_${benchmark}_config.xml" --bench "$benchmark" \
3129
--create=true --load=true --execute=true \
3230
--sample 1 --interval-monitor 1000 \
33-
--json-histograms results/histograms.json
31+
--json-histograms results/histograms.json

docker/cockroach-latest/down.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker compose down --remove-orphans --volumes
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker compose down --remove-orphans --volumes

docker/cockroach-latest/up.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker compose up -d --build
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker compose up -d --build

docker/mariadb-latest/down.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker-compose down --remove-orphans --volumes
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker-compose down --remove-orphans --volumes

docker/mariadb-latest/up.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker-compose up -d
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker-compose up -d

docker/mysql-5/down.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker compose down --remove-orphans --volumes
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker compose down --remove-orphans --volumes

docker/mysql-5/up.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker compose up -d
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker compose up -d

docker/mysql-latest/down.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker compose down --remove-orphans --volumes
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker compose down --remove-orphans --volumes

docker/mysql-latest/up.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker compose up -d
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker compose up -d

docker/postgres-latest/down.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#!/bin/bash
22

3-
docker compose down --remove-orphans --volumes
3+
set -eu
4+
scriptdir=$(dirname "$(readlink -f "$0")")
5+
cd "$scriptdir/"
6+
7+
docker compose down --remove-orphans --volumes

0 commit comments

Comments
 (0)