From dbe68c064c7ec909e8d72f88969b9b71d89dc64d Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Tue, 28 Jun 2022 17:33:50 +0530 Subject: [PATCH] =?UTF-8?q?chore(install-script):=20=F0=9F=97=91=EF=B8=8F?= =?UTF-8?q?=20=20remove=20arm=20YAML=20as=20already=20satisfied=20by=20sin?= =?UTF-8?q?gle=20YAML=20(#1326)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- deploy/install.sh | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/deploy/install.sh b/deploy/install.sh index 12814c8980..492336a566 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -36,9 +36,9 @@ is_mac() { [[ $OSTYPE == darwin* ]] } -is_arm64(){ - [[ `uname -m` == 'arm64' ]] -} +# is_arm64(){ +# [[ `uname -m` == 'arm64' ]] +# } check_os() { if is_mac; then @@ -237,11 +237,7 @@ bye() { # Prints a friendly good bye message and exits the script. echo "🔴 The containers didn't seem to start correctly. Please run the following command to check containers that may have errored out:" echo "" - if is_arm64; then - echo -e "$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.arm.yaml ps -a" - else - echo -e "$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml ps -a" - fi + echo -e "$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml ps -a" # echo "Please read our troubleshooting guide https://signoz.io/docs/deployment/docker#troubleshooting" echo "or reach us for support in #help channel in our Slack Community https://signoz.io/slack" @@ -466,22 +462,14 @@ start_docker echo "" echo -e "\n🟡 Pulling the latest container images for SigNoz.\n" -if is_arm64; then - $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.arm.yaml pull -else - $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml pull -fi +$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml pull echo "" echo "🟡 Starting the SigNoz containers. It may take a few minutes ..." echo # The docker-compose command does some nasty stuff for the `--detach` functionality. So we add a `|| true` so that the # script doesn't exit because this command looks like it failed to do it's thing. -if is_arm64; then - $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.arm.yaml up --detach --remove-orphans || true -else - $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml up --detach --remove-orphans || true -fi +$sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml up --detach --remove-orphans || true wait_for_containers_start 60 echo "" @@ -510,11 +498,7 @@ else echo -e "🟢 Your frontend is running on http://localhost:3301" echo "" - if is_arm64; then - echo "ℹ️ To bring down SigNoz and clean volumes : $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.arm.yaml down -v" - else - echo "ℹ️ To bring down SigNoz and clean volumes : $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml down -v" - fi + echo "ℹ️ To bring down SigNoz and clean volumes : $sudo_cmd docker-compose -f ./docker/clickhouse-setup/docker-compose.yaml down -v" echo "" echo "+++++++++++++++++++++++++++++++++++++++++++++++++"