Skip to content

Commit

Permalink
Fix some linter warnings, part 10 (#266)
Browse files Browse the repository at this point in the history
* Fix some linter warnings, part 10

* bump logspout version
  • Loading branch information
digitalfishpond authored and matrixik committed Oct 20, 2017
1 parent 38bda1f commit e67c303
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion logspout/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repository: monasca/logspout
variants:
- tag: 0.0.1
- tag: 0.0.2
aliases:
- :latest
args:
Expand Down
4 changes: 2 additions & 2 deletions logspout/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
MONASCA_LOG_AGENT_WAIT_RETRIES=${MONASCA_LOG_AGENT_WAIT_RETRIES:-"24"}
MONASCA_LOG_AGENT_WAIT_DELAY=${MONASCA_LOG_AGENT_WAIT_DELAY:-"5"}

if [ $MONASCA_WAIT_FOR_LOG_AGENT = "true" ]; then
if [ "$MONASCA_WAIT_FOR_LOG_AGENT" = "true" ]; then
RETRIES=$MONASCA_LOG_AGENT_WAIT_RETRIES \
SLEEP_LENGTH=$MONASCA_LOG_AGENT_WAIT_DELAY \
/wait-for.sh ${MONASCA_LOG_AGENT_URI} && /bin/logspout
/wait-for.sh "${MONASCA_LOG_AGENT_URI}" && /bin/logspout
else
/bin/logspout
fi
3 changes: 3 additions & 0 deletions monasca-agent-base/apk_install.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/bin/sh
# (C) Copyright 2017 FUJITSU LIMITED

install_apk_deps() {
apk add --no-cache libxml2 py2-psutil
apk add --no-cache --virtual build-dep git make g++ linux-headers libxml2-dev libxslt-dev
Expand Down

0 comments on commit e67c303

Please sign in to comment.