From c752abb491f77156002d3b634c003443b875234a Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Mon, 4 Mar 2024 23:48:56 +0000 Subject: [PATCH 1/2] Revert "feat: bind to IPv6 'any' as well as IPv4 'any' (#170)" This reverts commit 992aa5969b712364f85a90b585fa6611abcb4c92. --- pact_broker/config/puma.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pact_broker/config/puma.rb b/pact_broker/config/puma.rb index a6648feb..22eb6b6c 100644 --- a/pact_broker/config/puma.rb +++ b/pact_broker/config/puma.rb @@ -1,7 +1,6 @@ require_relative "../docker_configuration" -bind "tcp://0.0.0.0:#{PactBroker.docker_configuration.port}" -bind "tcp://[::]:#{PactBroker.docker_configuration.port}" +port PactBroker.docker_configuration.port if PactBroker.docker_configuration.puma_persistent_timeout persistent_timeout PactBroker.docker_configuration.puma_persistent_timeout From 89b5fa3b8f01ddcbaf7199253593bfc5483608ea Mon Sep 17 00:00:00 2001 From: Yousaf Nabi Date: Tue, 5 Mar 2024 11:55:25 +0000 Subject: [PATCH 2/2] fix(tests): update docker-compose sed to use correct tag --- script/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test.sh b/script/test.sh index ab8db3f4..b5a9d907 100755 --- a/script/test.sh +++ b/script/test.sh @@ -5,7 +5,7 @@ set -e docker_compose_files=$(find . -name "docker-compose-test*.yml") for file in $docker_compose_files; do - cat $file | sed -e "s~image: pactfoundation/pact-broker:.*~image: pactfoundation/pact-broker:${TAG}~g" > dc-tmp + cat $file | sed -e "s/pactfoundation\/pact-broker:latest.*/pactfoundation\/pact-broker:${TAG}\"/g" > dc-tmp mv dc-tmp $file done