Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Nginx and updated Consul image #23

Merged
merged 4 commits into from
Jul 22, 2016
Merged

Fixed Nginx and updated Consul image #23

merged 4 commits into from
Jul 22, 2016

Conversation

misterbisson
Copy link
Contributor

@misterbisson misterbisson commented Jul 22, 2016 •
edited
Loading

  • replaced containerpilot.json with co-process and telemetry
  • changed Nginx health check URL to more specific path to reduce likelihood of conflicts
  • update Consul image to https://github.com/autopilotpattern/consul
  • add build notes

If merged, it should be tagged as 4.5.3-r2.

@misterbisson misterbisson changed the title Fixed Nginx Fixed Nginx and updated Consul image Jul 22, 2016
@tgross
Copy link

tgross commented Jul 22, 2016

LGTM except for my concerns in autopilotpattern/nginx#18 (comment)

misterbisson
misterbisson reviewed Jul 22, 2016
View reviewed changes
docker-compose.yml
command: >
/usr/local/bin/containerpilot
/bin/consul agent -server
-bootstrap-expect 1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tgross this works to create a one-node Consul cluster that we can then scale to N nodes via Docker Compose.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that works -- when a node comes up if it expects only 1 and the CNS name it resolves is itself, then it'll form a split brain cluter.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Crap, you're right about that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix incoming.

@misterbisson misterbisson merged commit 6f0e8d1 into master Jul 22, 2016
@misterbisson misterbisson mentioned this pull request Jul 22, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@misterbisson @tgross