From 001a441d6783637c3588c0c09c2deb302a7e71ce Mon Sep 17 00:00:00 2001 From: Patrick Pfeiffer Date: Tue, 27 Feb 2024 09:29:48 +0100 Subject: [PATCH] (NOBIDS) improve local-deployment --- local-deployment/docker-compose.yml | 4 ++-- local-deployment/run.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/local-deployment/docker-compose.yml b/local-deployment/docker-compose.yml index 1e40109ea4..bd3ddbf0b5 100644 --- a/local-deployment/docker-compose.yml +++ b/local-deployment/docker-compose.yml @@ -12,7 +12,7 @@ services: <<: *default-service profiles: - build-once - command: /bin/bash -c "git config --global --add safe.directory '*' && make -j -B all" + command: /bin/bash -c "trap stopit SIGINT; stopit() { echo 'trapped SIGINT'; exit; }; git config --global --add safe.directory '*' && make -B all" indexer: <<: *default-service command: go run ./cmd/explorer -config /app/local-deployment/config.yml @@ -40,7 +40,7 @@ services: command: go run ./cmd/misc -config /app/local-deployment/config.yml -command=update-ratelimits misc: <<: *default-service - command: /bin/bash -c "while true; do date; sleep 1; done" + command: /bin/bash -c "trap stopit SIGINT; stopit() { echo 'trapped SIGINT'; exit; }; while true; do date; sleep 1; done" redis-sessions: image: redis:7 volumes: diff --git a/local-deployment/run.sh b/local-deployment/run.sh index 6c4b93c110..84701932b6 100755 --- a/local-deployment/run.sh +++ b/local-deployment/run.sh @@ -54,7 +54,7 @@ fn_redis() { fn_start() { fn_stop # build once before starting all services to prevent multiple parallel builds - docker compose --profile=build-once run build-once & + docker compose --profile=build-once run -T build-once & kurtosis run --enclave my-testnet . "$(cat network-params.json)" & wait bash provision-explorer-config.sh