From b3964798f567247d76e45341edcdb91bf2778728 Mon Sep 17 00:00:00 2001 From: jpantos <150924733+jpantos@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:47:33 +0200 Subject: [PATCH] fix: forces shell to be bash (#117) Co-authored-by: Juan M. Tirado --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6e971f7..dc2d422 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ PYTHON_FILES := $(PYTHON_FILES_WITHOUT_TESTS) tests STACK_BASE_NAME=stack-service-node INSTANCE_COUNT ?= 1 DEV_MODE ?= false +SHELL := $(shell which bash) .PHONY: check-version check-version: @@ -259,19 +260,19 @@ docker: check-swarm-init docker-build export ARGS="$(ARGS) --watch"; \ docker compose -f docker-compose.yml -f docker-compose.override.yml -p $$STACK_NAME $$EXTRA_COMPOSE up $$ARGS & \ COMPOSE_PID=$$!; \ - trap 'echo "Caught SIGINT, killing background processes..."; kill $$COMPOSE_PID; exit 1' SIGINT; \ + trap 'echo "Caught INT, killing background processes..."; kill $$COMPOSE_PID; exit 1' INT; \ else \ export ARGS="--detach --wait $(ARGS)"; \ docker compose -f docker-compose.yml -f docker-compose.override.yml -p $$STACK_NAME $$EXTRA_COMPOSE up $$ARGS; \ fi; \ - trap 'exit 1' SIGINT; \ + trap 'exit 1' INT; \ echo "Stack $$STACK_NAME deployed"; \ if [ "$(DEV_MODE)" = "true" ]; then \ wait $$COMPOSE_PID; \ fi; \ ) & \ done; \ - trap 'echo "Caught SIGINT, killing all background processes..."; kill 0; exit 1' SIGINT; \ + trap 'echo "Caught INT, killing all background processes..."; kill 0; exit 1' INT; \ wait # We need to use compose because swarm goes absolutely crazy on MacOS when using cross architecture # And can't pull the correct images