From d060858580f51b2689429d555b0f7a3cfd953083 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 10 Dec 2024 14:15:23 +0900 Subject: [PATCH] alpine: use LLVM 19 for arm64 It seems that the official PostgreSQL image is updated recently. --- 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 bf104c0..c88c859 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/13/Dockerfile b/alpine/13/Dockerfile index 30182b9..b2cdd33 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/14-slim/Dockerfile b/alpine/14-slim/Dockerfile index 8898b9d..4f574a4 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/14/Dockerfile b/alpine/14/Dockerfile index 53eb5c9..4186bf6 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/15-slim/Dockerfile b/alpine/15-slim/Dockerfile index 5e2800b..d1bda8b 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/15/Dockerfile b/alpine/15/Dockerfile index 3932c2a..d392e3f 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/16-slim/Dockerfile b/alpine/16-slim/Dockerfile index d01bcc2..1603e0d 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/16/Dockerfile b/alpine/16/Dockerfile index 7e437ba..ad6eeab 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/17-slim/Dockerfile b/alpine/17-slim/Dockerfile index dcb555e..381cfa9 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \ diff --git a/alpine/17/Dockerfile b/alpine/17/Dockerfile index f8ac542..0050907 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 \ - clang$([ $(arch) = "x86_64" ] && echo 19 || echo 15)-dev \ + clang19-dev \ cmake \ gettext-dev \ linux-headers \ - llvm$([ $(arch) = "x86_64" ] && echo 19 || echo 15) \ + llvm19 \ lz4-dev \ msgpack-c-dev \ rapidjson-dev \