Skip to content

Commit

Permalink
Merge pull request #9 from tgross/autopilotpattern_org
Browse files Browse the repository at this point in the history
Move images to autopilotpattern repo
  • Loading branch information
tgross committed Apr 1, 2016
2 parents 2f1c589 + 87711d0 commit 371983f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Triton trusted Consul
# Consul autopilot pattern

[Consul](http://www.consul.io/) in Docker, designed for availability and durability.

[![DockerPulls](https://img.shields.io/docker/pulls/misterbisson/triton-consul.svg)](https://registry.hub.docker.com/u/misterbisson/triton-consul/)
[![DockerStars](https://img.shields.io/docker/stars/misterbisson/triton-consul.svg)](https://registry.hub.docker.com/u/misterbisson/triton-consul/)
[![DockerPulls](https://img.shields.io/docker/pulls/autopilotpattern/consul.svg)](https://registry.hub.docker.com/u/autopilotpattern/consul/)
[![DockerStars](https://img.shields.io/docker/stars/autopilotpattern/consul.svg)](https://registry.hub.docker.com/u/autopilotpattern/consul/)

## Prep your environment

Expand All @@ -18,7 +18,7 @@ curl -O https://raw.githubusercontent.com/joyent/sdc-docker/master/tools/sdc-doc

## Start a trusted Consul raft

1. [Clone](https://github.com/misterbisson/triton-consul) or [download](https://github.com/misterbisson/triton-consul/archive/master.zip) this repo
1. [Clone](https://github.com/autopilotpattern/consul) or [download](https://github.com/autopilotpattern/consul/archive/master.zip) this repo
1. `cd` into the cloned or downloaded directory
1. Execute `bash start.sh` to start everything up
1. The Consul dashboard should automatically open in your browser, or follow the links output by the `start.sh` script
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# environment variable is used once at bootstrap and then forever
# discarded by that node.
consul:
image: misterbisson/triton-consul:latest
image: autopilotpattern/consul:latest
restart: always
mem_limit: 128m
ports:
Expand Down
5 changes: 2 additions & 3 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ TAG?=latest

# run the Docker build
build:
docker build -t="misterbisson/triton-consul:${TAG}" .
docker build -t="autopilotpattern/consul:${TAG}" .

# push our image to the public registry
ship: build
docker push "misterbisson/triton-consul:${TAG}"

docker push "autopilotpattern/consul:${TAG}"

0 comments on commit 371983f

Please sign in to comment.