Skip to content

Commit 88d7de6

Browse files
bnpfeifebnpfeife
authored
Merge pull request #605 from influxdata/BNP_release_influxdb_2.2.0
chore: release influxdb 2.2.0
2 parents 366ee4e + 5113398 commit 88d7de6

File tree

7 files changed

+980
-2
lines changed

7 files changed

+980
-2
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ workflows:
88
- test-influxdb:
99
matrix:
1010
parameters:
11-
version: ["2.0", "2.1"]
11+
version: ["2.0", "2.1", "2.2"]
1212

1313
jobs:
1414
build:
@@ -24,7 +24,7 @@ jobs:
2424
parameters:
2525
version:
2626
type: string
27-
enum: ["2.0", "2.1"]
27+
enum: ["2.0", "2.1", "2.2"]
2828
steps:
2929
- checkout
3030
- run: sudo apt-get update && sudo apt-get install -y jq

‎influxdb/2.2/Dockerfile

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
FROM buildpack-deps:buster-curl
2+
3+
RUN groupadd -r influxdb --gid=1000 && \
4+
useradd -r -g influxdb --uid=1000 --home-dir=/home/influxdb --shell=/bin/bash influxdb && \
5+
mkdir -p /home/influxdb && \
6+
chown -R influxdb:influxdb /home/influxdb
7+
8+
# Install gosu for easy step-down from root.
9+
# https://github.com/tianon/gosu/releases
10+
ENV GOSU_VER 1.12
11+
RUN set -eux; \
12+
dpkgArch="$(dpkg --print-architecture)" && \
13+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch" && \
14+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$dpkgArch.asc" && \
15+
export GNUPGHOME="$(mktemp -d)" && \
16+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && \
17+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu && \
18+
gpgconf --kill all && \
19+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc && \
20+
chmod +x /usr/local/bin/gosu && \
21+
gosu --version && \
22+
gosu nobody true
23+
24+
# Install the influxd server
25+
ENV INFLUXDB_VERSION 2.2.0
26+
RUN set -eux && \
27+
ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
28+
case "${dpkgArch##*-}" in \
29+
amd64) ARCH='amd64';; \
30+
arm64) ARCH='arm64';; \
31+
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
32+
esac && \
33+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
34+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
35+
export GNUPGHOME="$(mktemp -d)" && \
36+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
37+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
38+
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
39+
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
40+
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
41+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
42+
influxd version
43+
44+
# Install the influx CLI
45+
ENV INFLUX_CLI_VERSION 2.3.0
46+
RUN set -eux && \
47+
ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
48+
case "${dpkgArch##*-}" in \
49+
amd64) ARCH='amd64';; \
50+
arm64) ARCH='arm64';; \
51+
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
52+
esac && \
53+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
54+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
55+
export GNUPGHOME="$(mktemp -d)" && \
56+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
57+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
58+
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
59+
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
60+
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
61+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
62+
influx version
63+
64+
# Create standard directories expected by the entry-point.
65+
RUN mkdir /docker-entrypoint-initdb.d && \
66+
mkdir -p /var/lib/influxdb2 && \
67+
chown -R influxdb:influxdb /var/lib/influxdb2 && \
68+
mkdir -p /etc/influxdb2 && \
69+
chown -R influxdb:influxdb /etc/influxdb2
70+
VOLUME /var/lib/influxdb2 /etc/influxdb2
71+
72+
COPY default-config.yml /etc/defaults/influxdb2/config.yml
73+
COPY entrypoint.sh /entrypoint.sh
74+
75+
ENTRYPOINT ["/entrypoint.sh"]
76+
CMD ["influxd"]
77+
78+
EXPOSE 8086
79+
80+
ENV INFLUX_CONFIGS_PATH /etc/influxdb2/influx-configs
81+
ENV INFLUXD_INIT_PORT 9999
82+
ENV INFLUXD_INIT_PING_ATTEMPTS 600
83+
ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME default

‎influxdb/2.2/alpine/Dockerfile

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
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 gnupg run-parts && \
5+
update-ca-certificates
6+
7+
RUN addgroup -S -g 1000 influxdb && \
8+
adduser -S -G influxdb -u 1000 -h /home/influxdb -s /bin/sh influxdb && \
9+
mkdir -p /home/influxdb && \
10+
chown -R influxdb:influxdb /home/influxdb
11+
12+
# Install gosu for easy step-down from root.
13+
# https://github.com/tianon/gosu/releases
14+
ENV GOSU_VER 1.12
15+
RUN set -eux; \
16+
ARCH="$(apk --print-arch)" && \
17+
case "${ARCH}" in \
18+
x86_64) ARCH=amd64;; \
19+
aarch64) ARCH=arm64;; \
20+
*) echo "Unsupported architecture: ${ARCH}"; exit 1;; \
21+
esac && \
22+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$ARCH"; \
23+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VER/gosu-$ARCH.asc"; \
24+
export GNUPGHOME="$(mktemp -d)"; \
25+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
26+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
27+
gpgconf --kill all; \
28+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
29+
chmod +x /usr/local/bin/gosu; \
30+
gosu --version; \
31+
gosu nobody true
32+
33+
# Install the infuxd server
34+
ENV INFLUXDB_VERSION 2.2.0
35+
RUN set -eux && \
36+
ARCH="$(apk --print-arch)" && \
37+
if [ ${ARCH} = x86_64 ]; then \
38+
ARCH=amd64; \
39+
elif [ ${ARCH} = aarch64 ]; then \
40+
ARCH=arm64; \
41+
else \
42+
echo "Unsupported architecture: ${ARCH}" && exit 1; \
43+
fi && \
44+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
45+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
46+
export GNUPGHOME="$(mktemp -d)" && \
47+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
48+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
49+
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
50+
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
51+
cp influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}/influxd /usr/local/bin/influxd && \
52+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
53+
influxd version
54+
55+
# Install the influx CLI
56+
ENV INFLUX_CLI_VERSION 2.3.0
57+
RUN set -eux && \
58+
ARCH="$(apk --print-arch)" && \
59+
if [ ${ARCH} = x86_64 ]; then \
60+
ARCH=amd64; \
61+
elif [ ${ARCH} = aarch64 ]; then \
62+
ARCH=arm64; \
63+
else \
64+
echo "Unsupported architecture: ${ARCH}" && exit 1; \
65+
fi && \
66+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
67+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
68+
export GNUPGHOME="$(mktemp -d)" && \
69+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
70+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
71+
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
72+
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
73+
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
74+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
75+
influx version
76+
77+
# Create standard directories expected by the entry-point.
78+
RUN mkdir /docker-entrypoint-initdb.d && \
79+
mkdir -p /var/lib/influxdb2 && \
80+
chown -R influxdb:influxdb /var/lib/influxdb2 && \
81+
mkdir -p /etc/influxdb2 && \
82+
chown -R influxdb:influxdb /etc/influxdb2
83+
VOLUME /var/lib/influxdb2 /etc/influxdb2
84+
85+
COPY default-config.yml /etc/defaults/influxdb2/config.yml
86+
COPY entrypoint.sh /entrypoint.sh
87+
88+
ENTRYPOINT ["/entrypoint.sh"]
89+
CMD ["influxd"]
90+
91+
EXPOSE 8086
92+
93+
ENV INFLUX_CONFIGS_PATH /etc/influxdb2/influx-configs
94+
ENV INFLUXD_INIT_PORT 9999
95+
ENV INFLUXD_INIT_PING_ATTEMPTS 600
96+
ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME default

‎influxdb/2.2/alpine/default-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
bolt-path: /var/lib/influxdb2/influxd.bolt
2+
engine-path: /var/lib/influxdb2/engine
3+
nats-port: 4222

0 commit comments

Comments
 (0)