Skip to content

Update consul template to version 0.14.0 #32

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

Open
robvalk wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update consul template to version 0.14.0 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d44aac6
Using exec to launch consul-template, in order to take PID 1.
Mar 3, 2016
281d300
Update consule template to version 0.14.0
Apr 6, 2016
b7614e7
Merge pull request #1 from eesprit/master
Apr 7, 2016
a84d44d
Use hrd_dom() to ignore port number in Host header
Apr 7, 2016
60ed46f
Use hrd_beg() to ignore port number in Host header
Apr 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM alpine:3.3

MAINTAINER Steven Borrelli <steve@aster.is>

ENV CONSUL_TEMPLATE_VERSION=0.12.2
ENV CONSUL_TEMPLATE_VERSION=0.14.0

RUN apk update && \
apk add bash haproxy ca-certificates zip && \
Expand Down
2 changes: 1 addition & 1 deletion launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function launch_haproxy {
# be started)
[ -f /haproxy/haproxy.cfg ] && rm /haproxy/haproxy.cfg

${CONSUL_TEMPLATE} -config ${CONSUL_CONFIG} \
exec ${CONSUL_TEMPLATE} -config ${CONSUL_CONFIG} \
-log-level ${CONSUL_LOGLEVEL} \
-wait ${CONSUL_MINWAIT}:${CONSUL_MAXWAIT} \
-consul ${CONSUL_CONNECT} ${ctargs} ${vars}
Expand Down
2 changes: 1 addition & 1 deletion template/consul.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ frontend www

# Generated automatically by consul-template
{{ range services }}
acl host_{{ .Name }} hdr(host) -i {{ .Name }}.{{ or (env "HAPROXY_DOMAIN") "haproxy.service.consul" }}
acl host_{{ .Name }} hdr_beg(host) -i {{ .Name }}.{{ or (env "HAPROXY_DOMAIN") "haproxy.service.consul" }}
use_backend {{ .Name }}_backend if host_{{ .Name }}
{{ end }}

Expand Down