Skip to content

Commit d80e739

Browse files
jsternbergjsternberg
authored
Merge pull request #351 from aruniverse/bugfix/issue216
fix bug from issue#216
2 parents 961721b + 7d449ba commit d80e739

File tree

14 files changed

+125
-14
lines changed

14 files changed

+125
-14
lines changed

‎influxdb/1.5/alpine/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.5/data/alpine/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.5/data/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.5/init-influxdb.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
1521

22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1623
INIT_QUERY=""
1724
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"
1825

‎influxdb/1.6/alpine/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.6/data/alpine/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.6/data/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.6/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.7/alpine/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

‎influxdb/1.7/data/alpine/init-influxdb.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ fi
1111

1212
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
1313

14-
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d /var/lib/influxdb/meta 2>/dev/null)" ]; then
14+
# Check if an environment variable for where to put meta is set.
15+
# If so, then use that directory, otherwise use the default.
16+
if [ -z "$INFLUXDB_META_DIR" ]; then
17+
META_DIR="/var/lib/influxdb/meta"
18+
else
19+
META_DIR="$INFLUXDB_META_DIR"
20+
fi
21+
22+
if ( [ ! -z "$INIT_USERS" ] || [ ! -z "$INFLUXDB_DB" ] || [ "$(ls -A /docker-entrypoint-initdb.d 2> /dev/null)" ] ) && [ ! "$(ls -d "$META_DIR" 2>/dev/null)" ]; then
1523

1624
INIT_QUERY=""
1725
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"

0 commit comments

Comments
 (0)