Skip to content

Commit

Permalink
Merge pull request #60 from Shopify/shopify-org
Browse files Browse the repository at this point in the history
docker: move to shopify org
  • Loading branch information
sirupsen committed Jun 1, 2015
2 parents 0300d00 + 4ea7d07 commit 310754d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -29,9 +29,9 @@ tmp/build/toxiproxy-darwin-amd64:
GOOS=darwin GOARCH=amd64 GOPATH=$(COMBINED_GOPATH) go build -o $(@)

docker:
docker build --tag="sirupsen/toxiproxy:$(VERSION)" .
docker push sirupsen/toxiproxy:$(VERSION)
docker tag sirupsen/toxiproxy:$(VERSION) sirupsen/toxiproxy:latest
docker build --tag="shopify/toxiproxy:$(VERSION)" .
docker push shopify/toxiproxy:$(VERSION)
docker tag shopify/toxiproxy:$(VERSION) shopify/toxiproxy:latest

$(DEB): tmp/build/toxiproxy-linux-amd64
fpm -t deb \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -200,11 +200,11 @@ $ brew install toxiproxy

**Docker**

Toxiproxy is available on [Docker Hub](https://registry.hub.docker.com/u/sirupsen/toxiproxy/).
Toxiproxy is available on [Docker Hub](https://registry.hub.docker.com/u/shopify/toxiproxy/).

```bash
$ docker pull sirupsen/toxiproxy
$ docker run -it sirupsen/toxiproxy
$ docker pull shopify/toxiproxy
$ docker run -it shopify/toxiproxy
```

### 2. Populating Toxiproxy
Expand Down

0 comments on commit 310754d

Please sign in to comment.