Skip to content

Commit

Permalink
Fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmportella
dmportella committed Jan 23, 2017
2 parents d32bc4c + 01c2519 commit 9740eb6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ Please check the wiki for more information: [WIKI](https://github.com/dmportella

## Running in Docker

The docker container supports Docker API Socket as a volume (not recommended) or you can provide the Docker API Url (current does not support SSL).
The docker container supports Docker API Socket as a volume (not recommended) or you can provide the Docker API Url (currently does not support SSL).

### Running docker-beat with Docker API as Socker Volume

> $ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock dmportella/docker-beat --consumer webhook --webhook-endpoint http://requestb.in/rn7cixrn
### Running docker-beat with Docker API as Endpoint

> $ docker run --rm dmportella/docker-beat --consumer webhook --docker-endpoint "tcp://localhost:2375" --webhook-endpoint http://requestb.in/rn7cixrn
> $ docker run --rm dmportella/docker-beat --consumer webhook --docker-endpoint "tcp://localhost:2375" --webhook-endpoint http://requestb.in/rn7cixrn

0 comments on commit 9740eb6

Please sign in to comment.