diff --git a/influxdb/1.12/Dockerfile b/influxdb/1.12/Dockerfile
index 39156a41547acbfea9620a8283cf7f57bda02cb6..715e78e6d70ecfd0125692061fe1b3570c5c7afd 100644
--- a/influxdb/1.12/Dockerfile
+++ b/influxdb/1.12/Dockerfile
@@ -4,23 +4,31 @@ RUN addgroup --system --gid 1500 influxdb && \
adduser --system --uid 1500 --ingroup influxdb --home /var/lib/influxdb --shell /bin/false influxdb
ARG INFLUXDB_VERSION=1.12.0
-RUN gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
- export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
+RUN set -x && \
case "$(dpkg --print-architecture)" in \
- *amd64) ARCH=amd64 ;; \
- *arm64) ARCH=arm64 ;; \
- *) exit 1 ;; \
+ amd64) ARCH=amd64 ;; \
+ arm64) ARCH=arm64 ;; \
+ *) echo 'Unsupported Architecture' ; exit 1 ;; \
esac && \
- export INFLUXDB_DEB=influxdb-${INFLUXDB_VERSION}-${ARCH}.deb && \
- export INFLUXDB_ASC=influxdb-${INFLUXDB_VERSION}-${ARCH}.deb.asc && \
- curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_DEB}" && \
- curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_ASC}" && \
- gpg --batch --verify "${INFLUXDB_ASC}" "${INFLUXDB_DEB}" && \
- apt-get install -y "./${INFLUXDB_DEB}" && \
- rm -rf "${INFLUXDB_DEB}" \
- "${INFLUXDB_ASC}" \
- /var/lib/apt/lists/*
+ curl -fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb.asc" \
+ -fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" && \
+ # Verify InfluxDB 1.X OSS \
+ gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
+ # InfluxData Package Signing Key <support@influxdata.com> \
+ 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
+ gpg --batch --verify \
+ "influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb.asc" \
+ "influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" && \
+ # Install InfluxDB 1.X OSS \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install --no-install-recommends -y \
+ "/influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" && \
+ # Cleanup \
+ rm -r "influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb.asc" \
+ "influxdb_${INFLUXDB_VERSION}-1_${ARCH}.deb" \
+ /var/lib/apt/lists/*
+
COPY influxdb.conf /etc/influxdb/influxdb.conf
EXPOSE 8086
diff --git a/influxdb/1.12/alpine/Dockerfile b/influxdb/1.12/alpine/Dockerfile
index 7680b261de2977e5ae89bbc3f77145b9763cee13..642368357b561078fa09efbfe917cf3e965dc1cb 100644
--- a/influxdb/1.12/alpine/Dockerfile
+++ b/influxdb/1.12/alpine/Dockerfile
@@ -1,34 +1,35 @@
-FROM alpine:3.20
+FROM alpine:3.21
-RUN apk add --no-cache \
- bash \
- ca-certificates \
- tzdata && \
+RUN apk add --no-cache bash ca-certificates tzdata && \
update-ca-certificates
ARG INFLUXDB_VERSION=1.12.0
-RUN apk add --no-cache --virtual .build-deps \
- curl \
- gnupg \
- tar && \
- gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
+RUN apk add --no-cache --virtual .build-deps curl gnupg tar && \
case "$(apk --print-arch)" in \
- x86_64) ARCH=amd64 ;; \
- aarch64) ARCH=arm64 ;; \
- *) exit 1 ;; \
+ x86_64) ARCH=amd64 ;; \
+ aarch64) ARCH=arm64 ;; \
+ *) echo 'Unsupported Architecture' ; exit 1 ;; \
esac && \
- export INFLUXDB_TAR=influxdb-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
- export INFLUXDB_ASC=influxdb-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc && \
- curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_TAR}" && \
- curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_ASC}" && \
- gpg --batch --verify "${INFLUXDB_ASC}" "${INFLUXDB_TAR}" && \
- tar -xf "${INFLUXDB_TAR}" -C /usr/bin \
- influx \
- influx_inspect \
- influxd && \
- rm -rf "${INFLUXDB_TAR}" \
- "${INFLUXDB_ASC}" && \
+ curl -fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz.asc" \
+ -fsSLO "https://dl.influxdata.com/influxdb/releases/v${INFLUXDB_VERSION}/influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
+ # Verify InfluxDB 1.X OSS \
+ gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
+ # InfluxData Package Signing Key <support@influxdata.com> \
+ 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
+ gpg --batch --verify \
+ "influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz.asc" \
+ "influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
+ # Install InfluxDB 1.X OSS \
+ tar -xvf "influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" \
+ -C / --strip-components 1 --wildcards \
+ 'influxdb-*/usr/bin/influx' \
+ 'influxdb-*/usr/bin/influx_inspect' \
+ 'influxdb-*/usr/bin/influxd' && \
+ # Cleanup \
+ rm "influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz.asc" \
+ "influxdb-${INFLUXDB_VERSION}_linux_${ARCH}.tar.gz" && \
apk del .build-deps
+
COPY influxdb.conf /etc/influxdb/influxdb.conf
RUN addgroup --system --gid 1500 influxdb && \
diff --git a/influxdb/1.12/data/Dockerfile b/influxdb/1.12/data/Dockerfile
index 66c2db7d2d0672f673fbe6a7ed8afa0b87a424d9..baa1fb23bb74a23d4f08de6478a50c487ee6c4db 100644
--- a/influxdb/1.12/data/Dockerfile
+++ b/influxdb/1.12/data/Dockerfile
@@ -1,20 +1,25 @@
FROM buildpack-deps:bookworm-curl
-RUN set -ex && \
- mkdir ~/.gnupg; \
- echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
- for key in \
- 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
- do \
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
- done
+ENV INFLUXDB_VERSION=1.12.0-c1.12.0
+RUN curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
+ -fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" && \
+ # Verify InfluxDB 1.X Enterprise \
+ gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
+ # InfluxData Package Signing Key <support@influxdata.com> \
+ 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
+ gpg --batch --verify \
+ "influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
+ "influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" && \
+ # Install InfluxDB 1.X Enterprise \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install --no-install-recommends -y \
+ "/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" && \
+ # Cleanup \
+ rm -r "influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
+ "influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb" \
+ /var/lib/apt/lists/*
-ENV INFLUXDB_VERSION 1.12.0-c1.12.0
-RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc && \
- wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb && \
- gpg --batch --verify influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb.asc influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb && \
- dpkg -i influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb && \
- rm -f influxdb-data_${INFLUXDB_VERSION}-1_amd64.deb*
COPY influxdb.conf /etc/influxdb/influxdb.conf
EXPOSE 8086
diff --git a/influxdb/1.12/data/alpine/Dockerfile b/influxdb/1.12/data/alpine/Dockerfile
index 366c91032f548544d9e6e8b6a2f2a093078d1281..0dd094acd9e7320c2efd253b29045f52a8fc6335 100644
--- a/influxdb/1.12/data/alpine/Dockerfile
+++ b/influxdb/1.12/data/alpine/Dockerfile
@@ -1,28 +1,30 @@
-FROM alpine:3.20
+FROM alpine:3.21
-RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates && \
update-ca-certificates
-ENV INFLUXDB_VERSION 1.12.0-c1.12.0
-RUN set -ex && \
- apk add --no-cache --virtual .build-deps wget gnupg tar && \
- for key in \
- 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
- do \
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
- done && \
- wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \
- wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
- gpg --batch --verify influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
- mkdir -p /usr/src && \
- tar -C /usr/src -xzf influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
- rm -f /usr/src/influxdb-*/influxdb.conf && \
- chmod +x /usr/src/influxdb-*/usr/bin/* && \
- cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
- gpgconf --kill all && \
- rm -rf *.tar.gz* /usr/src /root/.gnupg && \
+ENV INFLUXDB_VERSION=1.12.0-c1.12.0
+RUN apk add --no-cache --virtual .build-deps curl gnupg tar && \
+ curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
+ -fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
+ # Verify InfluxDB 1.X Enterprise \
+ gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
+ # InfluxData Package Signing Key <support@influxdata.com> \
+ 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
+ gpg --batch --verify \
+ "influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
+ "influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
+ # Install InfluxDB 1.X Enterprise \
+ tar -xvf "influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" \
+ -C / --strip-components 1 --wildcards \
+ 'influxdb-*/usr/bin/influx' \
+ 'influxdb-*/usr/bin/influx_inspect' \
+ 'influxdb-*/usr/bin/influxd' && \
+ # Cleanup \
+ rm "influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
+ "influxdb-data-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
apk del .build-deps
+
COPY influxdb.conf /etc/influxdb/influxdb.conf
EXPOSE 8086
diff --git a/influxdb/1.12/meta/Dockerfile b/influxdb/1.12/meta/Dockerfile
index 4d1e310d2c4d3f4e6f7c23d5e7b09c50fdc50376..6d3c600f1709950b071c259fd41862c02282325c 100644
--- a/influxdb/1.12/meta/Dockerfile
+++ b/influxdb/1.12/meta/Dockerfile
@@ -1,20 +1,25 @@
FROM buildpack-deps:bookworm-curl
-RUN set -ex && \
- mkdir ~/.gnupg; \
- echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
- for key in \
- 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
- do \
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
- done
+ENV INFLUXDB_VERSION=1.12.0-c1.12.0
+RUN curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
+ -fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" && \
+ # Verify InfluxDB 1.X Enterprise \
+ gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
+ # InfluxData Package Signing Key <support@influxdata.com> \
+ 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
+ gpg --batch --verify \
+ "influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
+ "influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" && \
+ # Install InfluxDB 1.X Enterprise \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install --no-install-recommends -y \
+ "/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" && \
+ # Cleanup \
+ rm -r "influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc" \
+ "influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb" \
+ /var/lib/apt/lists/*
-ENV INFLUXDB_VERSION 1.12.0-c1.12.0
-RUN wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc && \
- wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb && \
- gpg --batch --verify influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb.asc influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb && \
- dpkg -i influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb && \
- rm -f influxdb-meta_${INFLUXDB_VERSION}-1_amd64.deb*
COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
EXPOSE 8091
diff --git a/influxdb/1.12/meta/alpine/Dockerfile b/influxdb/1.12/meta/alpine/Dockerfile
index fb7866b98bbd018f597218a69f321e10d62a77ee..316933a958f93f481fc5a0838b274bcae79f0f6c 100644
--- a/influxdb/1.12/meta/alpine/Dockerfile
+++ b/influxdb/1.12/meta/alpine/Dockerfile
@@ -1,28 +1,29 @@
-FROM alpine:3.20
+FROM alpine:3.21
-RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
RUN apk add --no-cache tzdata bash ca-certificates && \
update-ca-certificates
-ENV INFLUXDB_VERSION 1.12.0-c1.12.0
-RUN set -ex && \
- apk add --no-cache --virtual .build-deps wget gnupg tar && \
- for key in \
- 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E ; \
- do \
- gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys "$key" ; \
- done && \
- wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc && \
- wget --no-verbose https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
- gpg --batch --verify influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
- mkdir -p /usr/src && \
- tar -C /usr/src -xzf influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz && \
- rm -f /usr/src/influxdb-*/influxdb-meta.conf && \
- chmod +x /usr/src/influxdb-*/usr/bin/* && \
- cp -a /usr/src/influxdb-*/usr/bin/. /usr/bin/ && \
- gpgconf --kill all && \
- rm -rf *.tar.gz* /usr/src /root/.gnupg && \
+ENV INFLUXDB_VERSION=1.12.0-c1.12.0
+RUN apk add --no-cache --virtual .build-deps curl gnupg tar && \
+ curl -fsSLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
+ -fssLO "https://dl.influxdata.com/enterprise/releases/influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
+ # Verify InfluxDB 1.X Enterprise \
+ gpg --batch --keyserver hkp://keyserver.ubuntu.com --recv-keys \
+ # InfluxData Package Signing Key <support@influxdata.com> \
+ 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
+ gpg --batch --verify \
+ "influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
+ "influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
+ # Install InfluxDB 1.X Enterprise \
+ tar -xvf "influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" \
+ -C / --strip-components 1 --wildcards \
+ 'influxdb-*/usr/bin/influxd-ctl' \
+ 'influxdb-*/usr/bin/influxd-meta' && \
+ # Cleanup \
+ rm "influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz.asc" \
+ "influxdb-meta-${INFLUXDB_VERSION}_linux_amd64.tar.gz" && \
apk del .build-deps
+
COPY influxdb-meta.conf /etc/influxdb/influxdb-meta.conf
EXPOSE 8091