From f35546d783d8c819d61a38a88ec9a7e91ab01a1e Mon Sep 17 00:00:00 2001 From: David Lobe Date: Tue, 6 Aug 2024 12:04:44 +0200 Subject: [PATCH] test: fix docker test and build over main branch - Remove the dependency from the sendgrid-oai repo and prism. - Build and start containers on test target on a single statement. This should fix the builds over the main branch, because `docker-compose` is compose v1 which has been deprecated and not installed on newest versions of github actions `ubuntu-latest`. more info: https://docs.docker.com/compose/migrate/#what-are-the-differences-between-compose-v1-and-compose-v2 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f1802268..0b596b72 100644 --- a/Makefile +++ b/Makefile @@ -11,5 +11,4 @@ test-integ: test version ?= latest test-docker: - curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/HEAD/prism/prism.sh -o prism.sh - version=$(version) bash ./prism.sh + docker compose up --build --parallel --force-recreate --abort-on-container-exit --remove-orphans