Skip to content

Commit 014b126

Browse files
devanbenzdevanbenz
authored
Merge pull request #791 from influxdata/BNP_revise-influxdb_1.12-dockerfiles
2 parents 07658a1 + 3607d20 commit 014b126

File tree

6 files changed

+129
-107
lines changed

6 files changed

+129
-107
lines changed

‎influxdb/1.12/Dockerfile

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,31 @@ RUN addgroup --system --gid 1500 influxdb && \
44
adduser --system --uid 1500 --ingroup influxdb --home /var/lib/influxdb --shell /bin/false influxdb
55

66
ARG INFLUXDB_VERSION=1.12.0
7-
RUN gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
8-
export DEBIAN_FRONTEND=noninteractive && \
9-
apt-get update && \
7+
RUN set -x && \
108
case "$(dpkg --print-architecture)" in \
11-
*amd64) ARCH=amd64 ;; \
12-
*arm64) ARCH=arm64 ;; \
13-
*) exit 1 ;; \
9+
amd64) ARCH=amd64 ;; \
10+
arm64) ARCH=arm64 ;; \
11+
*) echo 'Unsupported Architecture' ; exit 1 ;; \
1412
esac && \
15-
export INFLUXDB_DEB=influxdb-${INFLUXDB_VERSION}-${ARCH}.deb && \
16-
export INFLUXDB_ASC=influxdb-${INFLUXDB_VERSION}-${ARCH}.deb.asc && \
17-
curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_DEB}" && \
18-
curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_ASC}" && \
19-
gpg --batch --verify "${INFLUXDB_ASC}" "${INFLUXDB_DEB}" && \
20-
apt-get install -y "./${INFLUXDB_DEB}" && \
21-
rm -rf "${INFLUXDB_DEB}" \
22-
"${INFLUXDB_ASC}" \
23-
/var/lib/apt/lists/*
13+
curl -fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb.asc" \
14+
-fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" && \
15+
# Verify InfluxDB 1.X OSS \
16+
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
17+
# InfluxData Package Signing Key <[email protected]> \
18+
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
19+
gpg --batch --verify \
20+
"influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb.asc" \
21+
"influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" && \
22+
# Install InfluxDB 1.X OSS \
23+
export DEBIAN_FRONTEND=noninteractive && \
24+
apt-get update && \
25+
apt-get install --no-install-recommends -y \
26+
"/influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" && \
27+
# Cleanup \
28+
rm -r "influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb.asc" \
29+
"influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" \
30+
/var/lib/apt/lists/*
31+
2432
COPY influxdb.conf /etc/influxdb/influxdb.conf
2533

2634
EXPOSE 8086

‎influxdb/1.12/alpine/Dockerfile

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.21
22

3-
RUN apk add --no-cache \
4-
bash \
5-
ca-certificates \
6-
tzdata && \
3+
RUN apk add --no-cache bash ca-certificates tzdata && \
74
update-ca-certificates
85

96
ARG INFLUXDB_VERSION=1.12.0
10-
RUN apk add --no-cache --virtual .build-deps \
11-
curl \
12-
gnupg \
13-
tar && \
14-
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
7+
RUN apk add --no-cache --virtual .build-deps curl gnupg tar && \
158
case "$(apk --print-arch)" in \
16-
x86_64) ARCH=amd64 ;; \
17-
aarch64) ARCH=arm64 ;; \
18-
*) exit 1 ;; \
9+
x86_64) ARCH=amd64 ;; \
10+
aarch64) ARCH=arm64 ;; \
11+
*) echo 'Unsupported Architecture' ; exit 1 ;; \
1912
esac && \
20-
export INFLUXDB_TAR=influxdb-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
21-
export INFLUXDB_ASC=influxdb-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
22-
curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_TAR}" && \
23-
curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_ASC}" && \
24-
gpg --batch --verify "${INFLUXDB_ASC}" "${INFLUXDB_TAR}" && \
25-
tar -xf "${INFLUXDB_TAR}" -C /usr/bin \
26-
influx \
27-
influx_inspect \
28-
influxd && \
29-
rm -rf "${INFLUXDB_TAR}" \
30-
"${INFLUXDB_ASC}" && \
13+
curl -fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz.asc" \
14+
-fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
15+
# Verify InfluxDB 1.X OSS \
16+
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
17+
# InfluxData Package Signing Key <[email protected]> \
18+
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
19+
gpg --batch --verify \
20+
"influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz.asc" \
21+
"influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
22+
# Install InfluxDB 1.X OSS \
23+
tar -xvf "influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" \
24+
-C / --strip-components 1 --wildcards \
25+
'influxdb-*/usr/bin/influx' \
26+
'influxdb-*/usr/bin/influx_inspect' \
27+
'influxdb-*/usr/bin/influxd' && \
28+
# Cleanup \
29+
rm "influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz.asc" \
30+
"influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
3131
apk del .build-deps
32+
3233
COPY influxdb.conf /etc/influxdb/influxdb.conf
3334

3435
RUN addgroup --system --gid 1500 influxdb && \

‎influxdb/1.12/data/Dockerfile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
FROM buildpack-deps:bookworm-curl
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
for key in \
7-
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
8-
do \
9-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
10-
done
3+
ENV INFLUXDB_VERSION=1.12.0-c1.12.0
4+
RUN curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
5+
-fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" && \
6+
# Verify InfluxDB 1.X Enterprise \
7+
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
8+
# InfluxData Package Signing Key <[email protected]> \
9+
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
10+
gpg --batch --verify \
11+
"influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
12+
"influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" && \
13+
# Install InfluxDB 1.X Enterprise \
14+
export DEBIAN_FRONTEND=noninteractive && \
15+
apt-get update && \
16+
apt-get install --no-install-recommends -y \
17+
"/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" && \
18+
# Cleanup \
19+
rm -r "influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
20+
"influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" \
21+
/var/lib/apt/lists/*
1122

12-
ENV INFLUXDB_VERSION 1.12.0-c1.12.0
13-
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc && \
14-
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb && \
15-
gpg --batch --verify influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb && \
16-
dpkg -i influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb && \
17-
rm -f influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb*
1823
COPY influxdb.conf /etc/influxdb/influxdb.conf
1924

2025
EXPOSE 8086

‎influxdb/1.12/data/alpine/Dockerfile

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.21
22

3-
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
43
RUN apk add --no-cache tzdata bash ca-certificates && \
54
update-ca-certificates
65

7-
ENV INFLUXDB_VERSION 1.12.0-c1.12.0
8-
RUN set -ex && \
9-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
10-
for key in \
11-
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
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-*/usr/bin/* && \
22-
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
23-
gpgconf --kill all && \
24-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
6+
ENV INFLUXDB_VERSION=1.12.0-c1.12.0
7+
RUN apk add --no-cache --virtual .build-deps curl gnupg tar && \
8+
curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
9+
-fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
10+
# Verify InfluxDB 1.X Enterprise \
11+
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
12+
# InfluxData Package Signing Key <[email protected]> \
13+
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
14+
gpg --batch --verify \
15+
"influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
16+
"influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
17+
# Install InfluxDB 1.X Enterprise \
18+
tar -xvf "influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" \
19+
-C / --strip-components 1 --wildcards \
20+
'influxdb-*/usr/bin/influx' \
21+
'influxdb-*/usr/bin/influx_inspect' \
22+
'influxdb-*/usr/bin/influxd' && \
23+
# Cleanup \
24+
rm "influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
25+
"influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
2526
apk del .build-deps
27+
2628
COPY influxdb.conf /etc/influxdb/influxdb.conf
2729

2830
EXPOSE 8086

‎influxdb/1.12/meta/Dockerfile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
FROM buildpack-deps:bookworm-curl
22

3-
RUN set -ex && \
4-
mkdir ~/.gnupg; \
5-
echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
6-
for key in \
7-
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
8-
do \
9-
gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
10-
done
3+
ENV INFLUXDB_VERSION=1.12.0-c1.12.0
4+
RUN curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
5+
-fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" && \
6+
# Verify InfluxDB 1.X Enterprise \
7+
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
8+
# InfluxData Package Signing Key <[email protected]> \
9+
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
10+
gpg --batch --verify \
11+
"influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
12+
"influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" && \
13+
# Install InfluxDB 1.X Enterprise \
14+
export DEBIAN_FRONTEND=noninteractive && \
15+
apt-get update && \
16+
apt-get install --no-install-recommends -y \
17+
"/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" && \
18+
# Cleanup \
19+
rm -r "influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
20+
"influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" \
21+
/var/lib/apt/lists/*
1122

12-
ENV INFLUXDB_VERSION 1.12.0-c1.12.0
13-
RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc && \
14-
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb && \
15-
gpg --batch --verify influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb && \
16-
dpkg -i influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb && \
17-
rm -f influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb*
1823
COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
1924

2025
EXPOSE 8091

‎influxdb/1.12/meta/alpine/Dockerfile

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1-
FROM alpine:3.20
1+
FROM alpine:3.21
22

3-
RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
43
RUN apk add --no-cache tzdata bash ca-certificates && \
54
update-ca-certificates
65

7-
ENV INFLUXDB_VERSION 1.12.0-c1.12.0
8-
RUN set -ex && \
9-
apk add --no-cache --virtual .build-deps wget gnupg tar && \
10-
for key in \
11-
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
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-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \
16-
wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
17-
gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
18-
mkdir -p /usr/src && \
19-
tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
20-
rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
21-
chmod +x /usr/src/influxdb-*/usr/bin/* && \
22-
cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
23-
gpgconf --kill all && \
24-
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
6+
ENV INFLUXDB_VERSION=1.12.0-c1.12.0
7+
RUN apk add --no-cache --virtual .build-deps curl gnupg tar && \
8+
curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
9+
-fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
10+
# Verify InfluxDB 1.X Enterprise \
11+
gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
12+
# InfluxData Package Signing Key <[email protected]> \
13+
9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
14+
gpg --batch --verify \
15+
"influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
16+
"influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
17+
# Install InfluxDB 1.X Enterprise \
18+
tar -xvf "influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" \
19+
-C / --strip-components 1 --wildcards \
20+
'influxdb-*/usr/bin/influxd-ctl' \
21+
'influxdb-*/usr/bin/influxd-meta' && \
22+
# Cleanup \
23+
rm "influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
24+
"influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
2525
apk del .build-deps
26+
2627
COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
2728

2829
EXPOSE 8091

0 commit comments

Comments
 (0)