From 28a4c4d24b6cd8cd26ef9a53e6aa7da4b0113a63 Mon Sep 17 00:00:00 2001
From: Dmitry Shemetov <dshemetov@ucdavis.edu>
Date: Thu, 12 Oct 2023 20:18:16 -0700
Subject: [PATCH] fix: try another approach

---
 .github/workflows/ci.yaml | 11 +++++++++--
 dev/local/Makefile        | 11 +++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c01ca552e..94ebea369 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -56,8 +56,15 @@ jobs:
           ln -s repos/delphi/delphi-epidata/dev/local/pyproject.toml repos/
           ln -s repos/delphi/delphi-epidata/dev/local/setup.cfg repos/
 
-      - name: Build docker images and run tests
-        run: make test
+      - name: Build docker images
+        run: |
+          make db
+          make web
+          make redis
+
+      - name: Run tests
+        run: |
+          make test
 
       - name: Clean Up
         run: |
diff --git a/dev/local/Makefile b/dev/local/Makefile
index 5f200776b..b4083ea34 100644
--- a/dev/local/Makefile
+++ b/dev/local/Makefile
@@ -75,6 +75,11 @@ $(info M1 system detected, changing docker platform to linux/amd64.)
 	override M1 =--platform linux/amd64
 endif
 
+.PHONY=db
+db:
+	@docker compose up delphi_database_epidata $(M1) --detach
+	@docker logs -f delphi_database_epidata >$(LOG_DB) 2>&1 &
+
 .PHONY=web
 web:
 	@docker compose up delphi_web_epidata $(M1) \
@@ -82,11 +87,6 @@ web:
 		--detach
 	@docker logs -f delphi_web_epidata >$(LOG_WEB) 2>&1 &
 
-.PHONY=db
-db:
-	@docker compose up delphi_database_epidata $(M1) --detach
-	@docker logs -f delphi_database_epidata >$(LOG_DB) 2>&1 &
-
 .PHONY=redis
 redis:
 	@docker compose up delphi_redis $(M1) --detach
@@ -100,7 +100,6 @@ test:
 r-test:
 	@docker compose run delphi_web_python $(M1) Rscript repos/delphi/delphi-epidata/integrations/client/test_delphi_epidata.R | tee r-test_output_$(NOW).log
 
-
 .PHONY=bash
 bash:
 	@docker compose run delphi_web_python $(M1) bash