From d31bf7ccefce72575158ee6f94d043ad32027fd4 Mon Sep 17 00:00:00 2001 From: Daniel Thorn Date: Thu, 1 Feb 2024 08:37:23 -0800 Subject: [PATCH 1/4] bug 1877534: use --attach-dependencies=false instead of --no-attach --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9d1a107a7..4964b60f1 100644 --- a/Makefile +++ b/Makefile @@ -51,16 +51,8 @@ setup: .env ## | Initialize services. .PHONY: run run: .env .docker-build ## | Run the web app and services. - # NOTE(willkg): We tag all the backing services with --no-attach here to - # prevent them from spamming stdout ${DC} up \ - --no-attach db \ - --no-attach statsd \ - --no-attach gcs-emulator \ - --no-attach redis-cache \ - --no-attach localstack \ - --no-attach oidcprovider \ - --no-attach statsd \ + --attach-dependencies=false \ web frontend fakesentry .PHONY: devcontainerbuild From 7c17de88c84664110910988aba422ff45bc818a3 Mon Sep 17 00:00:00 2001 From: Daniel Thorn Date: Thu, 1 Feb 2024 13:05:05 -0800 Subject: [PATCH 2/4] Apply suggestions from code review --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4964b60f1..212bd7ad0 100644 --- a/Makefile +++ b/Makefile @@ -51,8 +51,12 @@ setup: .env ## | Initialize services. .PHONY: run run: .env .docker-build ## | Run the web app and services. + # NOTE(willkg): We tag all the services with --attach here to + # prevent dependencies from spamming stdout ${DC} up \ - --attach-dependencies=false \ + --attach web \ + --attach frontend \ + --attach fakesentry \ web frontend fakesentry .PHONY: devcontainerbuild From 5f39b3079bb79b056e5124ce4f81d2edbea84426 Mon Sep 17 00:00:00 2001 From: Daniel Thorn Date: Thu, 1 Feb 2024 13:06:53 -0800 Subject: [PATCH 3/4] Apply suggestions from code review --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 212bd7ad0..8a7f1aee0 100644 --- a/Makefile +++ b/Makefile @@ -54,9 +54,9 @@ run: .env .docker-build ## | Run the web app and services. # NOTE(willkg): We tag all the services with --attach here to # prevent dependencies from spamming stdout ${DC} up \ - --attach web \ - --attach frontend \ - --attach fakesentry \ + --attach web \ + --attach frontend \ + --attach fakesentry \ web frontend fakesentry .PHONY: devcontainerbuild From 1e9905f692e9d5ed3a0db9fba5f4711aa506299e Mon Sep 17 00:00:00 2001 From: Daniel Thorn Date: Thu, 1 Feb 2024 13:07:40 -0800 Subject: [PATCH 4/4] Update Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8a7f1aee0..68738d9ff 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ run: .env .docker-build ## | Run the web app and services. # prevent dependencies from spamming stdout ${DC} up \ --attach web \ - --attach frontend \ - --attach fakesentry \ + --attach frontend \ + --attach fakesentry \ web frontend fakesentry .PHONY: devcontainerbuild