From 199f4f1c63dee159afdcc582daddc8a2d17a0ebf Mon Sep 17 00:00:00 2001 From: Ry Racherbaumer Date: Mon, 16 Sep 2024 11:09:32 -0500 Subject: [PATCH] WIP --- dev/compose | 4 ++++ dev/docker-compose | 4 ---- dev/down | 5 +++-- dev/up | 11 ++++------- 4 files changed, 11 insertions(+), 13 deletions(-) create mode 100755 dev/compose delete mode 100755 dev/docker-compose diff --git a/dev/compose b/dev/compose new file mode 100755 index 00000000..df7a8507 --- /dev/null +++ b/dev/compose @@ -0,0 +1,4 @@ +#!/bin/bash +set -eou pipefail + +docker compose -f dev/docker-compose.yml -p "xmtp-js" "$@" diff --git a/dev/docker-compose b/dev/docker-compose deleted file mode 100755 index c5d11929..00000000 --- a/dev/docker-compose +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -e - -docker compose -p xmtp-js -f dev/docker-compose.yml "$@" diff --git a/dev/down b/dev/down index 8589caf4..b065396e 100755 --- a/dev/down +++ b/dev/down @@ -1,4 +1,5 @@ #!/bin/bash -set -e +set -eou pipefail +script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -dev/docker-compose down +"${script_dir}"/compose down diff --git a/dev/up b/dev/up index 4f80ebce..e317f1f1 100755 --- a/dev/up +++ b/dev/up @@ -1,9 +1,6 @@ #!/bin/bash -set -e +set -eou pipefail +script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -if ! which docker &>/dev/null; then - echo "Docker required to run dev/up. Install it and run this again." - exit 1 -fi - -dev/docker-compose up -d +"${script_dir}"/compose pull +"${script_dir}"/compose up -d --build