From a24544f2a58512e67cb913a2a8f1b2b7bd4f7c6f Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Fri, 21 May 2021 13:54:10 +0000 Subject: [PATCH] docker: replace pushd in sirf-compose can just as well use cd, as changing directory is local to the script. This avoids annoying messages with the directory stack. --- docker/sirf-compose | 3 +-- docker/sirf-compose-devel | 3 +-- docker/sirf-compose-devel-server | 3 +-- docker/sirf-compose-devel-server-gpu | 3 +-- docker/sirf-compose-devel-server-multi | 3 +-- docker/sirf-compose-server | 3 +-- docker/sirf-compose-server-gpu | 3 +-- docker/sirf-compose-server-multi | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/docker/sirf-compose b/docker/sirf-compose index c72f646a..bf4ee0ce 100755 --- a/docker/sirf-compose +++ b/docker/sirf-compose @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" docker-compose -f docker-compose.yml -f docker-compose.nix.yml "$@" -popd diff --git a/docker/sirf-compose-devel b/docker/sirf-compose-devel index ab86feeb..5621c998 100755 --- a/docker/sirf-compose-devel +++ b/docker/sirf-compose-devel @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" ./sirf-compose -f docker-compose.devel.yml "$@" -popd diff --git a/docker/sirf-compose-devel-server b/docker/sirf-compose-devel-server index e3725e86..25ac9fe1 100755 --- a/docker/sirf-compose-devel-server +++ b/docker/sirf-compose-devel-server @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" ./sirf-compose-devel -f docker-compose.srv.yml "$@" -popd diff --git a/docker/sirf-compose-devel-server-gpu b/docker/sirf-compose-devel-server-gpu index 3752c6be..3c077bd2 100755 --- a/docker/sirf-compose-devel-server-gpu +++ b/docker/sirf-compose-devel-server-gpu @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" ./sirf-compose-devel-server -f docker-compose.srv-gpu.yml "$@" -popd diff --git a/docker/sirf-compose-devel-server-multi b/docker/sirf-compose-devel-server-multi index 835d429c..55a48da0 100755 --- a/docker/sirf-compose-devel-server-multi +++ b/docker/sirf-compose-devel-server-multi @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" ./sirf-compose-devel-server -f docker-compose.srv-multi.yml "$@" -popd diff --git a/docker/sirf-compose-server b/docker/sirf-compose-server index f2b67102..fa13f5a3 100755 --- a/docker/sirf-compose-server +++ b/docker/sirf-compose-server @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" ./sirf-compose -f docker-compose.srv.yml "$@" -popd diff --git a/docker/sirf-compose-server-gpu b/docker/sirf-compose-server-gpu index 09989e63..3f6ffc40 100755 --- a/docker/sirf-compose-server-gpu +++ b/docker/sirf-compose-server-gpu @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" ./sirf-compose-server -f docker-compose.srv-gpu.yml "$@" -popd diff --git a/docker/sirf-compose-server-multi b/docker/sirf-compose-server-multi index bb01e3e8..097991e1 100755 --- a/docker/sirf-compose-server-multi +++ b/docker/sirf-compose-server-multi @@ -1,4 +1,3 @@ #!/usr/bin/env bash -pushd "$(dirname $0)" +cd "$(dirname $0)" ./sirf-compose-server -f docker-compose.srv-multi.yml "$@" -popd