From 497da6de117c1abfead3f21a3afde7d1ae25f296 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 10 Dec 2024 10:49:51 +0900 Subject: [PATCH] alpine: use LLVM 18 on arm64 Because the official PostgreSQL images for arm64 use Alpine 3.20 not 3.21. --- alpine/13-slim/Dockerfile | 4 ++-- alpine/13/Dockerfile | 4 ++-- alpine/14-slim/Dockerfile | 4 ++-- alpine/14/Dockerfile | 4 ++-- alpine/15-slim/Dockerfile | 4 ++-- alpine/15/Dockerfile | 4 ++-- alpine/16-slim/Dockerfile | 4 ++-- alpine/16/Dockerfile | 4 ++-- alpine/17-slim/Dockerfile | 4 ++-- alpine/17/Dockerfile | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/alpine/13-slim/Dockerfile b/alpine/13-slim/Dockerfile index 83404f8..21564cd 100644 --- a/alpine/13-slim/Dockerfile +++ b/alpine/13-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/13/Dockerfile b/alpine/13/Dockerfile index a9cc371..364d779 100644 --- a/alpine/13/Dockerfile +++ b/alpine/13/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/14-slim/Dockerfile b/alpine/14-slim/Dockerfile index 3f7af8b..2d2903a 100644 --- a/alpine/14-slim/Dockerfile +++ b/alpine/14-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/14/Dockerfile b/alpine/14/Dockerfile index 253228e..af3112a 100644 --- a/alpine/14/Dockerfile +++ b/alpine/14/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/15-slim/Dockerfile b/alpine/15-slim/Dockerfile index 30971dd..46b9ac1 100644 --- a/alpine/15-slim/Dockerfile +++ b/alpine/15-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/15/Dockerfile b/alpine/15/Dockerfile index 7d22519..3bdb692 100644 --- a/alpine/15/Dockerfile +++ b/alpine/15/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/16-slim/Dockerfile b/alpine/16-slim/Dockerfile index 3f8e866..ac650d7 100644 --- a/alpine/16-slim/Dockerfile +++ b/alpine/16-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/16/Dockerfile b/alpine/16/Dockerfile index bf5360b..7de62e0 100644 --- a/alpine/16/Dockerfile +++ b/alpine/16/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/17-slim/Dockerfile b/alpine/17-slim/Dockerfile index 4956b82..66a9e3b 100644 --- a/alpine/17-slim/Dockerfile +++ b/alpine/17-slim/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/17/Dockerfile b/alpine/17/Dockerfile index 775a0bc..be218ca 100644 --- a/alpine/17/Dockerfile +++ b/alpine/17/Dockerfile @@ -8,11 +8,11 @@ RUN \ apk add --no-cache --virtual=.build-dependencies \ apache-arrow-dev \ build-base \ - clang19-dev \ + clang$([ $(arch) = "x86_64" ] && echo 19 || echo 18)-dev \ cmake \ gettext-dev \ linux-headers \ - llvm19 \ + llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 18) \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \