fix(influxdb): generate build without buildkit

influxdata · Oct 25, 2024 · dd7691f · dd7691f
1 parent 2561dca
commit dd7691f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/influxdb/1.11/Dockerfile b/influxdb/1.11/Dockerfile
@@ -1,17 +1,21 @@
 FROM buildpack-deps:bookworm-curl
 
-ARG TARGETARCH
 ARG INFLUXDB_VERSION=1.11.7
-ARG INFLUXDB_DEB=influxdb-${INFLUXDB_VERSION}-${TARGETARCH}.deb
-ARG INFLUXDB_ASC=influxdb-${INFLUXDB_VERSION}-${TARGETARCH}.deb.asc
 RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
+    case "$(dpkg --print-architecture)" in \
+      *amd64) ARCH=amd64 ;; \
+      *arm64) ARCH=arm64 ;; \
+      *) 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_PKG}" \
+    rm -rf "${INFLUXDB_DEB}" \
            "${INFLUXDB_ASC}" \
 	   /var/lib/apt/lists/*
 COPY influxdb.conf /etc/influxdb/influxdb.conf

diff --git a/influxdb/1.11/alpine/Dockerfile b/influxdb/1.11/alpine/Dockerfile
@@ -6,17 +6,21 @@ RUN apk add --no-cache \
       tzdata && \
     update-ca-certificates
 
-ARG TARGETARCH
 ARG INFLUXDB_VERSION=1.11.7
-ARG INFLUXDB_TAR=influxdb-${INFLUXDB_VERSION}-linux-${TARGETARCH}.tar.gz
-ARG INFLUXDB_ASC=influxdb-${INFLUXDB_VERSION}-linux-${TARGETARCH}.tar.gz.asc
 RUN apk add --no-cache --virtual .build-deps \
       curl \
       gnupg \
       tar && \
     gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 9D539D90D3328DC7D6C8D3B9D8FF8E1F7DF8B07E && \
-    curl -fLO "https://dl.influxdata.com/influxdb/releases/${INFLUXDB_ASC}" && \
+    case "$(apk --print-arch)" in \
+      x86_64)  ARCH=amd64 ;; \
+      aarch64) ARCH=arm64 ;; \
+      *) 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 \