Skip to content

Commit

Permalink
Fix entrypoint on debian images
Browse files Browse the repository at this point in the history 
Don't use a bashism when POSIX shell will do
  • Loading branch information
@errm
errm committed Mar 19, 2018
1 parent 31bd072 commit b428c7f
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions docker-image/v0.12/alpine-cloudwatch/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/alpine-elasticsearch/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/alpine-kafka/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/alpine-logentries/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/alpine-loggly/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/alpine-papertrail/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/alpine-s3/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-cloudwatch/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-elasticsearch/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-kafka/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-logentries/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-loggly/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-papertrail/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-s3/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions docker-image/v0.12/debian-stackdriver/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down
4 changes: 2 additions & 2 deletions templates/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

set -e

if [[ -z ${FLUENT_ELASTICSEARCH_USER} ]] ; then
if [ -z "$FLUENT_ELASTICSEARCH_USER" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_USER/d' /fluentd/etc/${FLUENTD_CONF}
fi

if [[ -z ${FLUENT_ELASTICSEARCH_PASSWORD} ]] ; then
if [ -z "FLUENT_ELASTICSEARCH_PASSWORD" ] ; then
sed -i '/FLUENT_ELASTICSEARCH_PASSWORD/d' /fluentd/etc/${FLUENTD_CONF}
fi

Expand Down

0 comments on commit b428c7f

Please sign in to comment.