From 4fe86c56028f6e8e7af33206593f8dc8fa942775 Mon Sep 17 00:00:00 2001
From: Lev Gorodetskiy <github@droserasprout.space>
Date: Tue, 13 Aug 2024 14:09:19 -0300
Subject: [PATCH] fix healthcheck spell

---
 Makefile                                                 | 4 ++++
 src/demo_blank/deploy/compose.swarm.yaml                 | 2 +-
 src/demo_blank/deploy/compose.yaml                       | 2 +-
 src/demo_evm_events/deploy/compose.swarm.yaml            | 2 +-
 src/demo_evm_events/deploy/compose.yaml                  | 2 +-
 src/demo_evm_transactions/deploy/compose.swarm.yaml      | 2 +-
 src/demo_evm_transactions/deploy/compose.yaml            | 2 +-
 src/demo_evm_uniswap/deploy/compose.swarm.yaml           | 2 +-
 src/demo_evm_uniswap/deploy/compose.yaml                 | 2 +-
 src/demo_starknet_events/deploy/compose.swarm.yaml       | 2 +-
 src/demo_starknet_events/deploy/compose.yaml             | 2 +-
 src/demo_tezos_auction/deploy/compose.swarm.yaml         | 2 +-
 src/demo_tezos_auction/deploy/compose.yaml               | 2 +-
 src/demo_tezos_big_maps/deploy/compose.swarm.yaml        | 2 +-
 src/demo_tezos_big_maps/deploy/compose.yaml              | 2 +-
 src/demo_tezos_dao/deploy/compose.swarm.yaml             | 2 +-
 src/demo_tezos_dao/deploy/compose.yaml                   | 2 +-
 src/demo_tezos_dex/deploy/compose.swarm.yaml             | 2 +-
 src/demo_tezos_dex/deploy/compose.yaml                   | 2 +-
 src/demo_tezos_domains/deploy/compose.swarm.yaml         | 2 +-
 src/demo_tezos_domains/deploy/compose.yaml               | 2 +-
 src/demo_tezos_events/deploy/compose.swarm.yaml          | 2 +-
 src/demo_tezos_events/deploy/compose.yaml                | 2 +-
 src/demo_tezos_factories/deploy/compose.swarm.yaml       | 2 +-
 src/demo_tezos_factories/deploy/compose.yaml             | 2 +-
 src/demo_tezos_head/deploy/compose.swarm.yaml            | 2 +-
 src/demo_tezos_head/deploy/compose.yaml                  | 2 +-
 src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml | 2 +-
 src/demo_tezos_nft_marketplace/deploy/compose.yaml       | 2 +-
 src/demo_tezos_raw/deploy/compose.swarm.yaml             | 2 +-
 src/demo_tezos_raw/deploy/compose.yaml                   | 2 +-
 src/demo_tezos_token/deploy/compose.swarm.yaml           | 2 +-
 src/demo_tezos_token/deploy/compose.yaml                 | 2 +-
 src/demo_tezos_token_balances/deploy/compose.swarm.yaml  | 2 +-
 src/demo_tezos_token_balances/deploy/compose.yaml        | 2 +-
 src/demo_tezos_token_transfers/deploy/compose.swarm.yaml | 2 +-
 src/demo_tezos_token_transfers/deploy/compose.yaml       | 2 +-
 src/dipdup/projects/base/deploy/compose.swarm.yaml.j2    | 2 +-
 src/dipdup/projects/base/deploy/compose.yaml.j2          | 2 +-
 39 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/Makefile b/Makefile
index c3a1325aa..52ce051b0 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,10 @@ demos:          ## Recreate demo projects from templates
 	python scripts/demos.py init ${DEMO}
 	make format lint
 
+demos_refresh:
+	for demo in `ls src | grep demo | grep -v etherlink`; do cd src/$$demo && dipdup init -b -f && cd ../..; done
+	make format lint
+
 before_release: ## Prepare for a new release after updating version in pyproject.toml
 	make format
 	make lint
diff --git a/src/demo_blank/deploy/compose.swarm.yaml b/src/demo_blank/deploy/compose.swarm.yaml
index e0cd38169..1fd34e002 100644
--- a/src/demo_blank/deploy/compose.swarm.yaml
+++ b/src/demo_blank/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_blank/deploy/compose.yaml b/src/demo_blank/deploy/compose.yaml
index 79dca295c..2c6b74e5b 100644
--- a/src/demo_blank/deploy/compose.yaml
+++ b/src/demo_blank/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_evm_events/deploy/compose.swarm.yaml b/src/demo_evm_events/deploy/compose.swarm.yaml
index 6c7f0bb2e..42a0c1efd 100644
--- a/src/demo_evm_events/deploy/compose.swarm.yaml
+++ b/src/demo_evm_events/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_evm_events/deploy/compose.yaml b/src/demo_evm_events/deploy/compose.yaml
index 052d238fb..c1f60cd28 100644
--- a/src/demo_evm_events/deploy/compose.yaml
+++ b/src/demo_evm_events/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_evm_transactions/deploy/compose.swarm.yaml b/src/demo_evm_transactions/deploy/compose.swarm.yaml
index 19341f766..087ef170d 100644
--- a/src/demo_evm_transactions/deploy/compose.swarm.yaml
+++ b/src/demo_evm_transactions/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_evm_transactions/deploy/compose.yaml b/src/demo_evm_transactions/deploy/compose.yaml
index 9fca0020f..19c56a231 100644
--- a/src/demo_evm_transactions/deploy/compose.yaml
+++ b/src/demo_evm_transactions/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_evm_uniswap/deploy/compose.swarm.yaml b/src/demo_evm_uniswap/deploy/compose.swarm.yaml
index d21f4c40e..99a27f92c 100644
--- a/src/demo_evm_uniswap/deploy/compose.swarm.yaml
+++ b/src/demo_evm_uniswap/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_evm_uniswap/deploy/compose.yaml b/src/demo_evm_uniswap/deploy/compose.yaml
index 8ebd5945a..30ad0d24b 100644
--- a/src/demo_evm_uniswap/deploy/compose.yaml
+++ b/src/demo_evm_uniswap/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_starknet_events/deploy/compose.swarm.yaml b/src/demo_starknet_events/deploy/compose.swarm.yaml
index 7124ecbdc..96befe249 100644
--- a/src/demo_starknet_events/deploy/compose.swarm.yaml
+++ b/src/demo_starknet_events/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_starknet_events/deploy/compose.yaml b/src/demo_starknet_events/deploy/compose.yaml
index 39fbfbaeb..f7b9107a5 100644
--- a/src/demo_starknet_events/deploy/compose.yaml
+++ b/src/demo_starknet_events/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_auction/deploy/compose.swarm.yaml b/src/demo_tezos_auction/deploy/compose.swarm.yaml
index c06aca89f..f610a0859 100644
--- a/src/demo_tezos_auction/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_auction/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_auction/deploy/compose.yaml b/src/demo_tezos_auction/deploy/compose.yaml
index b30b59283..d0bb18e27 100644
--- a/src/demo_tezos_auction/deploy/compose.yaml
+++ b/src/demo_tezos_auction/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_big_maps/deploy/compose.swarm.yaml b/src/demo_tezos_big_maps/deploy/compose.swarm.yaml
index 4b926dd27..817734f3a 100644
--- a/src/demo_tezos_big_maps/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_big_maps/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_big_maps/deploy/compose.yaml b/src/demo_tezos_big_maps/deploy/compose.yaml
index f2040aaec..96dfa394a 100644
--- a/src/demo_tezos_big_maps/deploy/compose.yaml
+++ b/src/demo_tezos_big_maps/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_dao/deploy/compose.swarm.yaml b/src/demo_tezos_dao/deploy/compose.swarm.yaml
index 3a76b5a43..4432c6c79 100644
--- a/src/demo_tezos_dao/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_dao/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_dao/deploy/compose.yaml b/src/demo_tezos_dao/deploy/compose.yaml
index 652603da7..e147d292c 100644
--- a/src/demo_tezos_dao/deploy/compose.yaml
+++ b/src/demo_tezos_dao/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_dex/deploy/compose.swarm.yaml b/src/demo_tezos_dex/deploy/compose.swarm.yaml
index 47eaa0a1c..2208b78b3 100644
--- a/src/demo_tezos_dex/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_dex/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_dex/deploy/compose.yaml b/src/demo_tezos_dex/deploy/compose.yaml
index b4a00d91d..dc2262c6c 100644
--- a/src/demo_tezos_dex/deploy/compose.yaml
+++ b/src/demo_tezos_dex/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_domains/deploy/compose.swarm.yaml b/src/demo_tezos_domains/deploy/compose.swarm.yaml
index b6736b333..9a468f051 100644
--- a/src/demo_tezos_domains/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_domains/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_domains/deploy/compose.yaml b/src/demo_tezos_domains/deploy/compose.yaml
index af3c3acb9..12bac33c8 100644
--- a/src/demo_tezos_domains/deploy/compose.yaml
+++ b/src/demo_tezos_domains/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_events/deploy/compose.swarm.yaml b/src/demo_tezos_events/deploy/compose.swarm.yaml
index ff62744b3..56ed4adad 100644
--- a/src/demo_tezos_events/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_events/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_events/deploy/compose.yaml b/src/demo_tezos_events/deploy/compose.yaml
index 65785803a..761278504 100644
--- a/src/demo_tezos_events/deploy/compose.yaml
+++ b/src/demo_tezos_events/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_factories/deploy/compose.swarm.yaml b/src/demo_tezos_factories/deploy/compose.swarm.yaml
index 83065d1d6..e7942b590 100644
--- a/src/demo_tezos_factories/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_factories/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_factories/deploy/compose.yaml b/src/demo_tezos_factories/deploy/compose.yaml
index 697bc6ec7..786f57c30 100644
--- a/src/demo_tezos_factories/deploy/compose.yaml
+++ b/src/demo_tezos_factories/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_head/deploy/compose.swarm.yaml b/src/demo_tezos_head/deploy/compose.swarm.yaml
index 7e03e70ef..6683b4cfa 100644
--- a/src/demo_tezos_head/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_head/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_head/deploy/compose.yaml b/src/demo_tezos_head/deploy/compose.yaml
index b5aec04c6..b853b9491 100644
--- a/src/demo_tezos_head/deploy/compose.yaml
+++ b/src/demo_tezos_head/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml b/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml
index 201222372..1c0de4265 100644
--- a/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_nft_marketplace/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_nft_marketplace/deploy/compose.yaml b/src/demo_tezos_nft_marketplace/deploy/compose.yaml
index 35549df16..77c059f16 100644
--- a/src/demo_tezos_nft_marketplace/deploy/compose.yaml
+++ b/src/demo_tezos_nft_marketplace/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_raw/deploy/compose.swarm.yaml b/src/demo_tezos_raw/deploy/compose.swarm.yaml
index bf7b3a812..c38dc0edf 100644
--- a/src/demo_tezos_raw/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_raw/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_raw/deploy/compose.yaml b/src/demo_tezos_raw/deploy/compose.yaml
index 94d2db108..56d85aa3e 100644
--- a/src/demo_tezos_raw/deploy/compose.yaml
+++ b/src/demo_tezos_raw/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_token/deploy/compose.swarm.yaml b/src/demo_tezos_token/deploy/compose.swarm.yaml
index ea0522b6b..7641f1275 100644
--- a/src/demo_tezos_token/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_token/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_token/deploy/compose.yaml b/src/demo_tezos_token/deploy/compose.yaml
index 7adbabb7e..c0919eb35 100644
--- a/src/demo_tezos_token/deploy/compose.yaml
+++ b/src/demo_tezos_token/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_token_balances/deploy/compose.swarm.yaml b/src/demo_tezos_token_balances/deploy/compose.swarm.yaml
index e6649b5a9..9dd27099f 100644
--- a/src/demo_tezos_token_balances/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_token_balances/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_token_balances/deploy/compose.yaml b/src/demo_tezos_token_balances/deploy/compose.yaml
index 2a62024b5..97970e77e 100644
--- a/src/demo_tezos_token_balances/deploy/compose.yaml
+++ b/src/demo_tezos_token_balances/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml b/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml
index 3daef952e..e2d395282 100644
--- a/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml
+++ b/src/demo_tezos_token_transfers/deploy/compose.swarm.yaml
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/demo_tezos_token_transfers/deploy/compose.yaml b/src/demo_tezos_token_transfers/deploy/compose.yaml
index 653a56cae..8f057db2a 100644
--- a/src/demo_tezos_token_transfers/deploy/compose.yaml
+++ b/src/demo_tezos_token_transfers/deploy/compose.yaml
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2 b/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2
index db2d2ad59..f9878cdcf 100644
--- a/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2
+++ b/src/dipdup/projects/base/deploy/compose.swarm.yaml.j2
@@ -37,7 +37,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5
diff --git a/src/dipdup/projects/base/deploy/compose.yaml.j2 b/src/dipdup/projects/base/deploy/compose.yaml.j2
index 57b1500a2..3d16ccf56 100644
--- a/src/dipdup/projects/base/deploy/compose.yaml.j2
+++ b/src/dipdup/projects/base/deploy/compose.yaml.j2
@@ -28,7 +28,7 @@ services:
       - POSTGRES_DB=dipdup
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
+      test: ["CMD-SHELL", "pg_isready -U dipdup"]
       interval: 10s
       timeout: 5s
       retries: 5