This repository has been archived by the owner on Aug 3, 2021. It is now read-only.
Merge upstream changes into registrator #56
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix service ip and port in consul interpolateService
…NT_KEY for TLS Cert/Pvt-Key
Environment Variable name changed to CONSUL_CLIENT_CERT & CONSUL_CLIE…
This adds the option "-explicit" which makes registrator ignore all services which don't have a SERVICE_NAME label.
Improve CLI option documentation
Add support for dep
Added Multistage Dockerfile for slimmer & hardened image
Consul check documentation improvement
Add Windows detection
Add circleci 2.0 support
Otherwise, the git directory is ignored.
hack: check circle directories
The switch to circleci 2.0 completely broke page builds - amongst other things - as the docker build type doesn't support docker volumes. Moving to the machine build type allows us to use docker volumes, though we lose the ability to use helper functions.
Properly use CircleCI 2.0 for builds
This should fix doc builds.
Use alpine:3.7 instead of scratch
Populate Consul's ServiceMeta using service.Attrs
Fix Dockerfile.dev
resolve merge conflicts in PR-568 (update vendor libraries to fix tls support)
|
Jason Harley seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
|
If you merge this in would you also add #57? It's too small of a change to warrant it's own deploy |
Feature/consul http method
In upstream Consul (as of May 2018), check.Script has been removed in favour of check.Args, which now results in the following build error: consul/consul.go:108:8: check.Script undefined (type *api.AgentServiceCheck has no field or method Script) consul/consul.go:110:8: check.Script undefined (type *api.AgentServiceCheck has no field or method Script) consul/consul.go:121:10: check.Script undefined (type *api.AgentServiceCheck has no field or method Script) Update to use the new convention.
Add consul grpc check
fix: information typo
Add CLI Option "explicit" do examples
Update README.md
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges the upstream changes that have occurred in gliderlabs/registrator. There are couple of relevant fixes, and a useful change adding an
-Explicitoption. This stops services being registered if they don't set theSERVICE_REGISTERenvironment var.It also switches to using godep for dependencies. It's an experiemental PR at the moment, and I want to see how easy it will be to merge these changes.