Skip to content

Commit 1577814

Browse files
authored
Merge pull request #1299 from infosiftr/alpine
In Alpine 3.21 bump llvm version
2 parents 0f542bc + 17818f2 commit 1577814

File tree

13 files changed

+63
-52
lines changed

13 files changed

+63
-52
lines changed

12/alpine3.20/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

12/alpine3.21/Dockerfile

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

13/alpine3.20/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

13/alpine3.21/Dockerfile

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

14/alpine3.20/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

14/alpine3.21/Dockerfile

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

15/alpine3.20/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

15/alpine3.21/Dockerfile

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

16/alpine3.20/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

16/alpine3.21/Dockerfile

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

17/alpine3.20/Dockerfile

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

17/alpine3.21/Dockerfile

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-alpine.template

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
FROM alpine:{{ env.variant | ltrimstr("alpine") }}
1+
{{
2+
def alpine_version:
3+
env.variant | ltrimstr("alpine")
4+
-}}
5+
FROM alpine:{{ alpine_version }}
26

37
# 70 is the standard uid/gid for "postgres" in Alpine
48
# https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
@@ -52,7 +56,14 @@ ENV PG_MAJOR {{ env.version }}
5256
ENV PG_VERSION {{ .version }}
5357
ENV PG_SHA256 {{ .sha256 }}
5458

55-
{{ def llvmver: "15" -}}
59+
{{
60+
def llvmver:
61+
if alpine_version | split(".") | map(tonumber) < [3, 21] then
62+
"15"
63+
else
64+
"19"
65+
end
66+
-}}
5667
ENV DOCKER_PG_LLVM_DEPS \
5768
llvm{{ llvmver }}-dev \
5869
clang{{ llvmver }}
@@ -117,9 +128,9 @@ RUN set -eux; \
117128
wget -O config/config.guess 'https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=7d3d27baf8107b630586c962c057e22149653deb'; \
118129
wget -O config/config.sub 'https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=7d3d27baf8107b630586c962c057e22149653deb'; \
119130
\
120-
# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n158
131+
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n172
121132
export LLVM_CONFIG="/usr/lib/llvm{{ llvmver }}/bin/llvm-config"; \
122-
# https://git.alpinelinux.org/aports/tree/community/postgresql12/APKBUILD?h=3.18-stable&id=a470294e6d6ca7059e41c54769b7c3c26ec901d4#n163
133+
# https://git.alpinelinux.org/aports/tree/community/postgresql15/APKBUILD?h=3.21-stable&id=40544ade947bec1798edb0f749f4e967e842624b#n177
123134
export CLANG=clang-{{ llvmver }}; \
124135
\
125136
# configure options taken from:

0 commit comments

Comments
 (0)