Skip to content

Commit

Permalink
fix(loki): panic on missing config (#720)
Browse files Browse the repository at this point in the history
* fix(loki): pass missing config error to user

Missing config errors are handled at the library level. Our own check mitigated
this and causes loki to SEGFAULT later on

* feat(loki): default config file in container

The container provides a default config file. Use it by default

* Revert "fix(loki): pass missing config error to user"

This reverts commit b2744fc, because loki it
assumed loki was incapable of running without config, which is not the case.
  • Loading branch information
sh0rez authored and cyriltovena committed Jul 8, 2019
1 parent 813f0d2 commit 4779b8b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions cmd/loki/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ COPY loki /bin/loki
COPY loki-local-config.yaml /etc/loki/local-config.yaml
EXPOSE 80
ENTRYPOINT [ "/bin/loki" ]
CMD ["-config.file=/etc/loki/local-config.yaml"]
1 change: 1 addition & 0 deletions cmd/loki/Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ RUN apk add --no-cache libc6-compat
# Pass flags to the program you are debugging using --, for example:`
# dlv exec ./hello -- server --config conf/config.toml`
ENTRYPOINT ["/usr/bin/dlv", "--listen=:40000", "--headless=true", "--api-version=2", "exec", "/bin/loki-debug", "--"]
CMD ["-config.file=/etc/loki/local-config.yaml"]

0 comments on commit 4779b8b

Please sign in to comment.