From b9e08b8c51a6c194178361e0a4dd36040debcb61 Mon Sep 17 00:00:00 2001 From: Beth Skurrie Date: Sun, 28 Apr 2019 19:16:52 +1000 Subject: [PATCH] docs: replace references to dius with pact-foundation --- .github/ISSUE_TEMPLATE.md | 2 +- POSTGRESQL.md | 2 +- README.md | 14 +++++++------- docker-compose.yml | 5 +++-- script/manual_push.sh | 2 +- script/next-docker-tag.sh | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b64330b..1654e7b 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -5,7 +5,7 @@ I have already (please mark the applicable with an `x`): * [ ] Confirmed this is the right place to raise the issue - only issues related to the Dockerization of the Pact Broker should be raised here. Issues related to the Pact Broker application itself should be raised in the [Pact Broker](https://github.com/pact-foundation/pact_broker) project. * [ ] Upgraded to the latest Pact Broker Docker image OR * [ ] Checked the [CHANGELOG](/CHANGELOG.md) to see if the issue I am about to raise has been fixed -* [ ] Read the [Troubleshooting](https://github.com/DiUS/pact_broker-docker/wiki/Troubleshooting) page +* [ ] Read the [Troubleshooting](https://github.com/pact-foundation/pact-broker-docker/wiki/Troubleshooting) page ## Software versions diff --git a/POSTGRESQL.md b/POSTGRESQL.md index 9d55048..7c5900b 100644 --- a/POSTGRESQL.md +++ b/POSTGRESQL.md @@ -27,7 +27,7 @@ The best way is to run postgresql via docker as well. 3. Start the PactBroker container via: ```console - $ docker run --name pactbroker --link pactbroker-db:postgres -e PACT_BROKER_DATABASE_USERNAME=pactbrokeruser -e PACT_BROKER_DATABASE_PASSWORD=TheUserPassword -e PACT_BROKER_DATABASE_HOST=postgres -e PACT_BROKER_DATABASE_NAME=pactbroker -d -p 9292:9292 dius/pact-broker + $ docker run --name pactbroker --link pactbroker-db:postgres -e PACT_BROKER_DATABASE_USERNAME=pactbrokeruser -e PACT_BROKER_DATABASE_PASSWORD=TheUserPassword -e PACT_BROKER_DATABASE_HOST=postgres -e PACT_BROKER_DATABASE_NAME=pactbroker -d -p 9292:9292 pactfoundation/pact-broker ``` 4. (Don't need to run this) Finally if you want to reconfigure/remove the container you will need to use diff --git a/README.md b/README.md index 8e4becf..6b1b52b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -Dockerised Pact Broker [![Build Status](https://travis-ci.org/DiUS/pact_broker-docker.svg)](https://travis-ci.org/DiUS/pact_broker-docker) +Dockerised Pact Broker [![Build Status](https://travis-ci.org/pact-foundation/pact-broker-docker.svg)](https://travis-ci.org/pact-foundation/pact-broker-docker) ================== -This repository deploys [Pact Broker][pact-broker] using lightweight containers using Docker. You can pull the dius/pact-broker image from [Dockerhub][pact-broker-docker]. +This repository deploys [Pact Broker][pact-broker] using lightweight containers using Docker. You can pull the pactfoundation/pact-broker image from [Dockerhub][pact-broker-docker]. ## Prerequisites @@ -107,13 +107,13 @@ See the [Troubleshooting][troubleshooting] page on the wiki. [docker]: https://docs.docker.com/install/ [pact-broker]: https://github.com/pact-foundation/pact_broker -[pact-broker-docker]: https://hub.docker.com/r/dius/pact-broker/ +[pact-broker-docker]: https://hub.docker.com/r/pactfoundation/pact-broker/ [pact-broker-openshift]: https://github.com/jaimeniswonger/pact-broker-openshift [badges]: https://github.com/pact-foundation/pact_broker/wiki/Provider-verification-badges -[troubleshooting]: https://github.com/DiUS/pact_broker-docker/wiki/Troubleshooting -[postgres]: https://github.com/DiUS/pact_broker-docker/blob/master/POSTGRESQL.md -[test-script]: https://github.com/DiUS/pact_broker-docker/blob/master/script/test.sh -[docker-compose]: https://github.com/DiUS/pact_broker-docker/blob/master/docker-compose.yml +[troubleshooting]: https://github.com/pact-foundation/pact-broker-docker/wiki/Troubleshooting +[postgres]: https://github.com/pact-foundation/pact-broker-docker/blob/master/POSTGRESQL.md +[test-script]: https://github.com/pact-foundation/pact-broker-docker/blob/master/script/test.sh +[docker-compose]: https://github.com/pact-foundation/pact-broker-docker/blob/master/docker-compose.yml [pact-broker-wiki]: https://github.com/pact-foundation/pact_broker/wiki [reverse-proxy]: https://github.com/pact-foundation/pact_broker/wiki/Configuration#running-the-broker-behind-a-reverse-proxy [webhook-whitelist]: https://github.com/pact-foundation/pact_broker/wiki/Configuration#webhook-whitelists diff --git a/docker-compose.yml b/docker-compose.yml index aaadb9b..3f63728 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,8 +13,9 @@ services: POSTGRES_DB: postgres broker_app: - build: . - image: dius/pact-broker + image: pactfoundation/pact-broker + ports: + - "80:80" links: - postgres depends_on: diff --git a/script/manual_push.sh b/script/manual_push.sh index 76b394e..4df66e5 100755 --- a/script/manual_push.sh +++ b/script/manual_push.sh @@ -3,7 +3,7 @@ set -ex -IMAGE_NAME="dius/pact-broker" +IMAGE_NAME="pactfoundation/pact-broker" TAG=$(script/next-docker-tag.sh) docker pull ${IMAGE_NAME} diff --git a/script/next-docker-tag.sh b/script/next-docker-tag.sh index 8a90d99..ff4f97d 100755 --- a/script/next-docker-tag.sh +++ b/script/next-docker-tag.sh @@ -1,4 +1,4 @@ -DOCKER_IMAGE="dius/pact-broker" +DOCKER_IMAGE="pactfoundation/pact-broker" gem_version=$(BUNDLE_GEMFILE=pact_broker/Gemfile bundle exec ruby -e "require 'pact_broker/version'; puts PactBroker::VERSION") existing_tags=$(wget -q https://registry.hub.docker.com/v1/repositories/${DOCKER_IMAGE}/tags -O - | jq -r .[].name) existing_release_numbers_for_current_gem_version=$(echo "$existing_tags" | grep "${gem_version}-" | sed 's/'${gem_version}'-//g')