diff --git a/README.md b/README.md index b6d03fe3..902e846f 100644 --- a/README.md +++ b/README.md @@ -157,10 +157,10 @@ If you are running more than one Pact Broker Docker container at a time for the You can see a working example in the [docker-compose-clean.yml](./docker-compose-clean.yml) file. To run the example locally, run: ``` -docker-compose -f docker-compose-clean.yml up pact-broker +docker compose -f docker-compose-clean.yml up pact-broker # in another console -docker-compose -f docker-compose-clean.yml up clean +docker compose -f docker-compose-clean.yml up clean ``` ### Known issues with the data clean up task @@ -173,8 +173,8 @@ For a quick start with the Pact Broker and Postgres, we have an example [Docker Compose][docker-compose] setup you can use: 1. Modify the `docker-compose.yml` file as required. -2. Run `docker-compose build` to build the pact_broker container locally. -3. Run `docker-compose up` to get a running Pact Broker and a clean Postgres database. +2. Run `docker compose build` to build the pact_broker container locally. +3. Run `docker compose up` to get a running Pact Broker and a clean Postgres database. Now you can access your local broker: diff --git a/example-k8s-deployment/infrastructure/deploy_cfn.sh b/example-k8s-deployment/infrastructure/deploy_cfn.sh index 78954291..0391acc9 100755 --- a/example-k8s-deployment/infrastructure/deploy_cfn.sh +++ b/example-k8s-deployment/infrastructure/deploy_cfn.sh @@ -3,7 +3,7 @@ stack=$1 env=$2 -docker-compose run --rm stackup-"$env" pact-broker-"$stack" up \ +docker compose run --rm stackup-"$env" pact-broker-"$stack" up \ -t infrastructure/"$stack"/template.yaml \ -p infrastructure/"$stack"/envs/common.yaml \ -p infrastructure/"$stack"/envs/"$env".yaml diff --git a/script/test.sh b/script/test.sh index 2b08b55c..8211073e 100755 --- a/script/test.sh +++ b/script/test.sh @@ -12,23 +12,23 @@ for file in $docker_compose_files; do done cleanup() { - docker-compose -f docker-compose-tests.yml rm -fv || true - docker-compose -f docker-compose-test-different-env-var-names.yml rm -fv || true + docker compose -f docker-compose-tests.yml rm -fv || true + docker compose -f docker-compose-test-different-env-var-names.yml rm -fv || true } trap cleanup EXIT cleanup -docker-compose -f docker-compose-tests.yml up --build --abort-on-container-exit --exit-code-from sut --remove-orphans +docker compose -f docker-compose-tests.yml up --build --abort-on-container-exit --exit-code-from sut --remove-orphans cleanup export PACT_BROKER_BASIC_AUTH_USERNAME=foo export PACT_BROKER_BASIC_AUTH_PASSWORD=bar export PACT_BROKER_PUBLIC_HEARTBEAT=true -docker-compose -f docker-compose-tests.yml up --build --abort-on-container-exit --exit-code-from sut --remove-orphans +docker compose -f docker-compose-tests.yml up --build --abort-on-container-exit --exit-code-from sut --remove-orphans unset PACT_BROKER_BASIC_AUTH_USERNAME unset PACT_BROKER_BASIC_AUTH_PASSWORD unset PACT_BROKER_PUBLIC_HEARTBEAT -docker-compose -f docker-compose-test-different-env-var-names.yml up --build --abort-on-container-exit --exit-code-from sut --remove-orphans +docker compose -f docker-compose-test-different-env-var-names.yml up --build --abort-on-container-exit --exit-code-from sut --remove-orphans