Skip to content

Commit 1a8c080

Browse files
jeffreyssmith2ndjeffreyssmith2nd
committed
chore: add 2.4
1 parent 1cec93e commit 1a8c080

File tree

7 files changed

+963
-2
lines changed

7 files changed

+963
-2
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ workflows:
2222
- test-influxdb:
2323
matrix:
2424
parameters:
25-
version: ["2.0", "2.1", "2.2", "2.3"]
25+
version: ["2.0", "2.1", "2.2", "2.3", "2.4"]
2626
- publish_docker_images:
2727
<<: *master_filter
2828
- test-influxdb-binaries:
@@ -48,7 +48,7 @@ jobs:
4848
parameters:
4949
version:
5050
type: string
51-
enum: ["2.0", "2.1", "2.2", "2.3"]
51+
enum: ["2.0", "2.1", "2.2", "2.3", "2.4"]
5252
steps:
5353
- checkout
5454
- run: |

‎influxdb/2.4/Dockerfile

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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.4.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_linux_${ARCH}/influxd /usr/local/bin/influxd && \
41+
gpgconf --kill all && \
42+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
43+
influxd version
44+
45+
# Install the influx CLI
46+
ENV INFLUX_CLI_VERSION 2.4.0
47+
RUN set -eux && \
48+
ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
49+
case "${dpkgArch##*-}" in \
50+
amd64) ARCH='amd64';; \
51+
arm64) ARCH='arm64';; \
52+
*) echo "Unsupported architecture: ${dpkgArch}"; exit 1;; \
53+
esac && \
54+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
55+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
56+
export GNUPGHOME="$(mktemp -d)" && \
57+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
58+
gpg --batch --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
59+
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
60+
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
61+
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
62+
gpgconf --kill all && \
63+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
64+
influx version
65+
66+
# Create standard directories expected by the entry-point.
67+
RUN mkdir /docker-entrypoint-initdb.d && \
68+
mkdir -p /var/lib/influxdb2 && \
69+
chown -R influxdb:influxdb /var/lib/influxdb2 && \
70+
mkdir -p /etc/influxdb2 && \
71+
chown -R influxdb:influxdb /etc/influxdb2
72+
VOLUME /var/lib/influxdb2 /etc/influxdb2
73+
74+
COPY default-config.yml /etc/defaults/influxdb2/config.yml
75+
COPY entrypoint.sh /entrypoint.sh
76+
77+
ENTRYPOINT ["/entrypoint.sh"]
78+
CMD ["influxd"]
79+
80+
EXPOSE 8086
81+
82+
ENV INFLUX_CONFIGS_PATH /etc/influxdb2/influx-configs
83+
ENV INFLUXD_INIT_PORT 9999
84+
ENV INFLUXD_INIT_PING_ATTEMPTS 600
85+
ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME default

‎influxdb/2.4/alpine/Dockerfile

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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 su-exec && \
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 the infuxd server
13+
ENV INFLUXDB_VERSION 2.4.0
14+
RUN set -eux && \
15+
ARCH="$(apk --print-arch)" && \
16+
if [ ${ARCH} = x86_64 ]; then \
17+
ARCH=amd64; \
18+
elif [ ${ARCH} = aarch64 ]; then \
19+
ARCH=arm64; \
20+
else \
21+
echo "Unsupported architecture: ${ARCH}" && exit 1; \
22+
fi && \
23+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
24+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
25+
export GNUPGHOME="$(mktemp -d)" && \
26+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
27+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
28+
gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
29+
tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
30+
cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
31+
gpgconf --kill all && \
32+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}* && \
33+
influxd version
34+
35+
# Install the influx CLI
36+
ENV INFLUX_CLI_VERSION 2.4.0
37+
RUN set -eux && \
38+
ARCH="$(apk --print-arch)" && \
39+
if [ ${ARCH} = x86_64 ]; then \
40+
ARCH=amd64; \
41+
elif [ ${ARCH} = aarch64 ]; then \
42+
ARCH=arm64; \
43+
else \
44+
echo "Unsupported architecture: ${ARCH}" && exit 1; \
45+
fi && \
46+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc && \
47+
wget --no-verbose https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
48+
export GNUPGHOME="$(mktemp -d)" && \
49+
echo "disable-ipv6" >> $GNUPGHOME/dirmngr.conf && \
50+
gpg --keyserver keys.openpgp.org --recv-keys 8C2D403D3C3BDB81A4C27C883C3E4B7317FFE40A && \
51+
gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
52+
tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
53+
cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
54+
gpgconf --kill all && \
55+
rm -rf "$GNUPGHOME" influxdb2.key influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}* && \
56+
influx version
57+
58+
# Create standard directories expected by the entry-point.
59+
RUN mkdir /docker-entrypoint-initdb.d && \
60+
mkdir -p /var/lib/influxdb2 && \
61+
chown -R influxdb:influxdb /var/lib/influxdb2 && \
62+
mkdir -p /etc/influxdb2 && \
63+
chown -R influxdb:influxdb /etc/influxdb2
64+
VOLUME /var/lib/influxdb2 /etc/influxdb2
65+
66+
COPY default-config.yml /etc/defaults/influxdb2/config.yml
67+
COPY entrypoint.sh /entrypoint.sh
68+
69+
ENTRYPOINT ["/entrypoint.sh"]
70+
CMD ["influxd"]
71+
72+
EXPOSE 8086
73+
74+
ENV INFLUX_CONFIGS_PATH /etc/influxdb2/influx-configs
75+
ENV INFLUXD_INIT_PORT 9999
76+
ENV INFLUXD_INIT_PING_ATTEMPTS 600
77+
ENV DOCKER_INFLUXDB_INIT_CLI_CONFIG_NAME default

‎influxdb/2.4/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)