Skip to content

Commit e251756

Browse files
bnpfeifebnpfeife
authored
Merge pull request #626 from influxdata/BNP_release_enterprise_1.10
chore: release influxdb enterprise 1.10.0
2 parents d94aa3f + e56a47c commit e251756

18 files changed

+649
-0
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ workflows:
3131
product:
3232
- "influxdb/1.9/data"
3333
- "influxdb/1.9/meta"
34+
- "influxdb/1.10/data"
35+
- "influxdb/1.10/meta"
3436

3537
jobs:
3638
build:

‎influxdb/1.10/data/Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM buildpack-deps:bullseye-curl
2+
3+
RUN set -ex && \
4+
mkdir ~/.gnupg; \
5+
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6+
for key in \
7+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
8+
do \
9+
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
10+
done
11+
12+
ENV INFLUXDB_VERSION 1.10.0-c1.10.0
13+
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc && \
14+
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
15+
gpg --batch --verify influxdb-data_${INFLUXDB_VERSION}_amd64.deb.asc influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
16+
dpkg -i influxdb-data_${INFLUXDB_VERSION}_amd64.deb && \
17+
rm -f influxdb-data_${INFLUXDB_VERSION}_amd64.deb*
18+
COPY influxdb.conf /etc/influxdb/influxdb.conf
19+
20+
EXPOSE 8086
21+
22+
VOLUME /var/lib/influxdb
23+
24+
COPY entrypoint.sh /entrypoint.sh
25+
COPY init-influxdb.sh /init-influxdb.sh
26+
ENTRYPOINT ["/entrypoint.sh"]
27+
CMD ["influxd"]

‎influxdb/1.10/data/alpine/Dockerfile‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
FROM alpine:3.14
2+
3+
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
4+
RUN apk add --no-cache tzdata bash ca-certificates && \
5+
update-ca-certificates
6+
7+
ENV INFLUXDB_VERSION 1.10.0-c1.10.0
8+
RUN set -ex && \
9+
apk add --no-cache --virtual .build-deps wget gnupg tar && \
10+
for key in \
11+
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
12+
do \
13+
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
14+
done && \
15+
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \
16+
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
17+
gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
18+
mkdir -p /usr/src && \
19+
tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
20+
rm -f /usr/src/influxdb-*/influxdb.conf && \
21+
chmod +x /usr/src/influxdb-*/* && \
22+
cp -a /usr/src/influxdb-*/* /usr/bin/ && \
23+
gpgconf --kill all && \
24+
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
25+
apk del .build-deps
26+
COPY influxdb.conf /etc/influxdb/influxdb.conf
27+
28+
EXPOSE 8086
29+
30+
VOLUME /var/lib/influxdb
31+
32+
COPY entrypoint.sh /entrypoint.sh
33+
COPY init-influxdb.sh /init-influxdb.sh
34+
ENTRYPOINT ["/entrypoint.sh"]
35+
CMD ["influxd"]

‎influxdb/1.10/data/alpine/entrypoint.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -e
3+
4+
export INFLUXDB_HOSTNAME=${INFLUXDB_HOSTNAME:-$HOSTNAME}
5+
6+
if [ "${1:0:1}" = '-' ]; then
7+
set -- influxd "$@"
8+
fi
9+
10+
if [ "$1" = 'influxd' ]; then
11+
/init-influxdb.sh "${@:2}"
12+
fi
13+
14+
exec "$@"

‎influxdb/1.10/data/alpine/influxdb.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[meta]
2+
dir = "/var/lib/influxdb/meta"
3+
4+
[data]
5+
dir = "/var/lib/influxdb/data"
6+
engine = "tsm1"
7+
wal-dir = "/var/lib/influxdb/wal"
8+
9+
[hinted-handoff]
10+
dir = "/var/lib/influxdb/hh"

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

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
#!/bin/bash
2+
set -e
3+
4+
AUTH_ENABLED="$INFLUXDB_HTTP_AUTH_ENABLED"
5+
6+
if [ -z "$AUTH_ENABLED" ]; then
7+
AUTH_ENABLED="$(grep -iE '^\s*auth-enabled\s*=\s*true' /etc/influxdb/influxdb.conf | grep -io 'true' | cat)"
8+
else
9+
AUTH_ENABLED="$(echo "$INFLUXDB_HTTP_AUTH_ENABLED" | grep -io 'true' | cat)"
10+
fi
11+
12+
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
13+
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
23+
24+
INIT_QUERY=""
25+
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"
26+
27+
if [ ! -z "$INIT_USERS" ]; then
28+
29+
if [ -z "$INFLUXDB_ADMIN_PASSWORD" ]; then
30+
INFLUXDB_ADMIN_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
31+
echo "INFLUXDB_ADMIN_PASSWORD:$INFLUXDB_ADMIN_PASSWORD"
32+
fi
33+
34+
INIT_QUERY="CREATE USER \"$INFLUXDB_ADMIN_USER\" WITH PASSWORD '$INFLUXDB_ADMIN_PASSWORD' WITH ALL PRIVILEGES"
35+
elif [ ! -z "$INFLUXDB_DB" ]; then
36+
INIT_QUERY="$CREATE_DB_QUERY"
37+
else
38+
INIT_QUERY="SHOW DATABASES"
39+
fi
40+
41+
INFLUXDB_INIT_PORT="8086"
42+
43+
INFLUXDB_HTTP_BIND_ADDRESS=127.0.0.1:$INFLUXDB_INIT_PORT INFLUXDB_HTTP_HTTPS_ENABLED=false influxd "$@" &
44+
pid="$!"
45+
46+
INFLUX_CMD="influx -host 127.0.0.1 -port $INFLUXDB_INIT_PORT -execute "
47+
48+
for i in {30..0}; do
49+
if $INFLUX_CMD "$INIT_QUERY" &> /dev/null; then
50+
break
51+
fi
52+
echo 'influxdb init process in progress...'
53+
sleep 1
54+
done
55+
56+
if [ "$i" = 0 ]; then
57+
echo >&2 'influxdb init process failed.'
58+
exit 1
59+
fi
60+
61+
if [ ! -z "$INIT_USERS" ]; then
62+
63+
INFLUX_CMD="influx -host 127.0.0.1 -port $INFLUXDB_INIT_PORT -username ${INFLUXDB_ADMIN_USER} -password ${INFLUXDB_ADMIN_PASSWORD} -execute "
64+
65+
if [ ! -z "$INFLUXDB_DB" ]; then
66+
$INFLUX_CMD "$CREATE_DB_QUERY"
67+
fi
68+
69+
if [ ! -z "$INFLUXDB_USER" ] && [ -z "$INFLUXDB_USER_PASSWORD" ]; then
70+
INFLUXDB_USER_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
71+
echo "INFLUXDB_USER_PASSWORD:$INFLUXDB_USER_PASSWORD"
72+
fi
73+
74+
if [ ! -z "$INFLUXDB_USER" ]; then
75+
$INFLUX_CMD "CREATE USER \"$INFLUXDB_USER\" WITH PASSWORD '$INFLUXDB_USER_PASSWORD'"
76+
77+
$INFLUX_CMD "REVOKE ALL PRIVILEGES FROM \"$INFLUXDB_USER\""
78+
79+
if [ ! -z "$INFLUXDB_DB" ]; then
80+
$INFLUX_CMD "GRANT ALL ON \"$INFLUXDB_DB\" TO \"$INFLUXDB_USER\""
81+
fi
82+
fi
83+
84+
if [ ! -z "$INFLUXDB_WRITE_USER" ] && [ -z "$INFLUXDB_WRITE_USER_PASSWORD" ]; then
85+
INFLUXDB_WRITE_USER_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
86+
echo "INFLUXDB_WRITE_USER_PASSWORD:$INFLUXDB_WRITE_USER_PASSWORD"
87+
fi
88+
89+
if [ ! -z "$INFLUXDB_WRITE_USER" ]; then
90+
$INFLUX_CMD "CREATE USER \"$INFLUXDB_WRITE_USER\" WITH PASSWORD '$INFLUXDB_WRITE_USER_PASSWORD'"
91+
$INFLUX_CMD "REVOKE ALL PRIVILEGES FROM \"$INFLUXDB_WRITE_USER\""
92+
93+
if [ ! -z "$INFLUXDB_DB" ]; then
94+
$INFLUX_CMD "GRANT WRITE ON \"$INFLUXDB_DB\" TO \"$INFLUXDB_WRITE_USER\""
95+
fi
96+
fi
97+
98+
if [ ! -z "$INFLUXDB_READ_USER" ] && [ -z "$INFLUXDB_READ_USER_PASSWORD" ]; then
99+
INFLUXDB_READ_USER_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
100+
echo "INFLUXDB_READ_USER_PASSWORD:$INFLUXDB_READ_USER_PASSWORD"
101+
fi
102+
103+
if [ ! -z "$INFLUXDB_READ_USER" ]; then
104+
$INFLUX_CMD "CREATE USER \"$INFLUXDB_READ_USER\" WITH PASSWORD '$INFLUXDB_READ_USER_PASSWORD'"
105+
$INFLUX_CMD "REVOKE ALL PRIVILEGES FROM \"$INFLUXDB_READ_USER\""
106+
107+
if [ ! -z "$INFLUXDB_DB" ]; then
108+
$INFLUX_CMD "GRANT READ ON \"$INFLUXDB_DB\" TO \"$INFLUXDB_READ_USER\""
109+
fi
110+
fi
111+
112+
fi
113+
114+
for f in /docker-entrypoint-initdb.d/*; do
115+
case "$f" in
116+
*.sh) echo "$0: running $f"; . "$f" ;;
117+
*.iql) echo "$0: running $f"; $INFLUX_CMD "$(cat ""$f"")"; echo ;;
118+
*) echo "$0: ignoring $f" ;;
119+
esac
120+
echo
121+
done
122+
123+
if ! kill -s TERM "$pid" || ! wait "$pid"; then
124+
echo >&2 'influxdb init process failed. (Could not stop influxdb)'
125+
exit 1
126+
fi
127+
128+
fi

‎influxdb/1.10/data/entrypoint.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -e
3+
4+
export INFLUXDB_HOSTNAME=${INFLUXDB_HOSTNAME:-$HOSTNAME}
5+
6+
if [ "${1:0:1}" = '-' ]; then
7+
set -- influxd "$@"
8+
fi
9+
10+
if [ "$1" = 'influxd' ]; then
11+
/init-influxdb.sh "${@:2}"
12+
fi
13+
14+
exec "$@"

‎influxdb/1.10/data/influxdb.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[meta]
2+
dir = "/var/lib/influxdb/meta"
3+
4+
[data]
5+
dir = "/var/lib/influxdb/data"
6+
engine = "tsm1"
7+
wal-dir = "/var/lib/influxdb/wal"
8+
9+
[hinted-handoff]
10+
dir = "/var/lib/influxdb/hh"

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

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
#!/bin/bash
2+
set -e
3+
4+
AUTH_ENABLED="$INFLUXDB_HTTP_AUTH_ENABLED"
5+
6+
if [ -z "$AUTH_ENABLED" ]; then
7+
AUTH_ENABLED="$(grep -iE '^\s*auth-enabled\s*=\s*true' /etc/influxdb/influxdb.conf | grep -io 'true' | cat)"
8+
else
9+
AUTH_ENABLED="$(echo "$INFLUXDB_HTTP_AUTH_ENABLED" | grep -io 'true' | cat)"
10+
fi
11+
12+
INIT_USERS=$([ ! -z "$AUTH_ENABLED" ] && [ ! -z "$INFLUXDB_ADMIN_USER" ] && echo 1 || echo)
13+
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
23+
24+
INIT_QUERY=""
25+
CREATE_DB_QUERY="CREATE DATABASE $INFLUXDB_DB"
26+
27+
if [ ! -z "$INIT_USERS" ]; then
28+
29+
if [ -z "$INFLUXDB_ADMIN_PASSWORD" ]; then
30+
INFLUXDB_ADMIN_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
31+
echo "INFLUXDB_ADMIN_PASSWORD:$INFLUXDB_ADMIN_PASSWORD"
32+
fi
33+
34+
INIT_QUERY="CREATE USER \"$INFLUXDB_ADMIN_USER\" WITH PASSWORD '$INFLUXDB_ADMIN_PASSWORD' WITH ALL PRIVILEGES"
35+
elif [ ! -z "$INFLUXDB_DB" ]; then
36+
INIT_QUERY="$CREATE_DB_QUERY"
37+
else
38+
INIT_QUERY="SHOW DATABASES"
39+
fi
40+
41+
INFLUXDB_INIT_PORT="8086"
42+
43+
INFLUXDB_HTTP_BIND_ADDRESS=127.0.0.1:$INFLUXDB_INIT_PORT INFLUXDB_HTTP_HTTPS_ENABLED=false influxd "$@" &
44+
pid="$!"
45+
46+
INFLUX_CMD="influx -host 127.0.0.1 -port $INFLUXDB_INIT_PORT -execute "
47+
48+
for i in {30..0}; do
49+
if $INFLUX_CMD "$INIT_QUERY" &> /dev/null; then
50+
break
51+
fi
52+
echo 'influxdb init process in progress...'
53+
sleep 1
54+
done
55+
56+
if [ "$i" = 0 ]; then
57+
echo >&2 'influxdb init process failed.'
58+
exit 1
59+
fi
60+
61+
if [ ! -z "$INIT_USERS" ]; then
62+
63+
INFLUX_CMD="influx -host 127.0.0.1 -port $INFLUXDB_INIT_PORT -username ${INFLUXDB_ADMIN_USER} -password ${INFLUXDB_ADMIN_PASSWORD} -execute "
64+
65+
if [ ! -z "$INFLUXDB_DB" ]; then
66+
$INFLUX_CMD "$CREATE_DB_QUERY"
67+
fi
68+
69+
if [ ! -z "$INFLUXDB_USER" ] && [ -z "$INFLUXDB_USER_PASSWORD" ]; then
70+
INFLUXDB_USER_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
71+
echo "INFLUXDB_USER_PASSWORD:$INFLUXDB_USER_PASSWORD"
72+
fi
73+
74+
if [ ! -z "$INFLUXDB_USER" ]; then
75+
$INFLUX_CMD "CREATE USER \"$INFLUXDB_USER\" WITH PASSWORD '$INFLUXDB_USER_PASSWORD'"
76+
77+
$INFLUX_CMD "REVOKE ALL PRIVILEGES FROM \"$INFLUXDB_USER\""
78+
79+
if [ ! -z "$INFLUXDB_DB" ]; then
80+
$INFLUX_CMD "GRANT ALL ON \"$INFLUXDB_DB\" TO \"$INFLUXDB_USER\""
81+
fi
82+
fi
83+
84+
if [ ! -z "$INFLUXDB_WRITE_USER" ] && [ -z "$INFLUXDB_WRITE_USER_PASSWORD" ]; then
85+
INFLUXDB_WRITE_USER_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
86+
echo "INFLUXDB_WRITE_USER_PASSWORD:$INFLUXDB_WRITE_USER_PASSWORD"
87+
fi
88+
89+
if [ ! -z "$INFLUXDB_WRITE_USER" ]; then
90+
$INFLUX_CMD "CREATE USER \"$INFLUXDB_WRITE_USER\" WITH PASSWORD '$INFLUXDB_WRITE_USER_PASSWORD'"
91+
$INFLUX_CMD "REVOKE ALL PRIVILEGES FROM \"$INFLUXDB_WRITE_USER\""
92+
93+
if [ ! -z "$INFLUXDB_DB" ]; then
94+
$INFLUX_CMD "GRANT WRITE ON \"$INFLUXDB_DB\" TO \"$INFLUXDB_WRITE_USER\""
95+
fi
96+
fi
97+
98+
if [ ! -z "$INFLUXDB_READ_USER" ] && [ -z "$INFLUXDB_READ_USER_PASSWORD" ]; then
99+
INFLUXDB_READ_USER_PASSWORD="$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;)"
100+
echo "INFLUXDB_READ_USER_PASSWORD:$INFLUXDB_READ_USER_PASSWORD"
101+
fi
102+
103+
if [ ! -z "$INFLUXDB_READ_USER" ]; then
104+
$INFLUX_CMD "CREATE USER \"$INFLUXDB_READ_USER\" WITH PASSWORD '$INFLUXDB_READ_USER_PASSWORD'"
105+
$INFLUX_CMD "REVOKE ALL PRIVILEGES FROM \"$INFLUXDB_READ_USER\""
106+
107+
if [ ! -z "$INFLUXDB_DB" ]; then
108+
$INFLUX_CMD "GRANT READ ON \"$INFLUXDB_DB\" TO \"$INFLUXDB_READ_USER\""
109+
fi
110+
fi
111+
112+
fi
113+
114+
for f in /docker-entrypoint-initdb.d/*; do
115+
case "$f" in
116+
*.sh) echo "$0: running $f"; . "$f" ;;
117+
*.iql) echo "$0: running $f"; $INFLUX_CMD "$(cat ""$f"")"; echo ;;
118+
*) echo "$0: ignoring $f" ;;
119+
esac
120+
echo
121+
done
122+
123+
if ! kill -s TERM "$pid" || ! wait "$pid"; then
124+
echo >&2 'influxdb init process failed. (Could not stop influxdb)'
125+
exit 1
126+
fi
127+
128+
fi

‎influxdb/1.10/entrypoint.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -e
3+
4+
if [ "${1:0:1}" = '-' ]; then
5+
set -- influxd "$@"
6+
fi
7+
8+
if [ "$1" = 'influxd' ]; then
9+
/init-influxdb.sh "${@:2}"
10+
fi
11+
12+
exec "$@"

0 commit comments

Comments
 (0)