Skip to content

Commit 4c4693e

Browse files
authored
Merge pull request #643 from infosiftr/alpine-jit
Add JIT support for Alpine on 11+
2 parents d88a8f8 + c8bf23b commit 4c4693e

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

11/alpine/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ RUN set -ex \
5454
libxml2-dev \
5555
libxslt-dev \
5656
linux-headers \
57+
llvm8-dev clang g++ \
5758
make \
5859
# openldap-dev \
5960
openssl-dev \
@@ -111,6 +112,7 @@ RUN set -ex \
111112
--with-libxml \
112113
--with-libxslt \
113114
--with-icu \
115+
--with-llvm \
114116
&& make -j "$(nproc)" world \
115117
&& make install-world \
116118
&& make -C contrib install \

12/alpine/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ RUN set -ex \
5454
libxml2-dev \
5555
libxslt-dev \
5656
linux-headers \
57+
llvm8-dev clang g++ \
5758
make \
5859
# openldap-dev \
5960
openssl-dev \
@@ -111,6 +112,7 @@ RUN set -ex \
111112
--with-libxml \
112113
--with-libxslt \
113114
--with-icu \
115+
--with-llvm \
114116
&& make -j "$(nproc)" world \
115117
&& make install-world \
116118
&& make -C contrib install \

Dockerfile-alpine.template

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ RUN set -ex \
5454
libxml2-dev \
5555
libxslt-dev \
5656
linux-headers \
57+
llvm8-dev clang g++ \
5758
make \
5859
# openldap-dev \
5960
openssl-dev \
@@ -111,6 +112,7 @@ RUN set -ex \
111112
--with-libxml \
112113
--with-libxslt \
113114
--with-icu \
115+
--with-llvm \
114116
&& make -j "$(nproc)" world \
115117
&& make install-world \
116118
&& make -C contrib install \

update.sh

+4
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ for version in "${versions[@]}"; do
9696
if [ "$majorVersion" -gt 11 ]; then
9797
sed -i '/backwards compat/d' "$version/$variant/Dockerfile"
9898
fi
99+
if [ "$majorVersion" -lt 11 ]; then
100+
# JIT / LLVM is only supported in PostgreSQL 11+ (https://github.com/docker-library/postgres/issues/475)
101+
sed -i '/llvm/d' "$version/$variant/Dockerfile"
102+
fi
99103

100104
travisEnv="\n - VERSION=$version VARIANT=$variant$travisEnv"
101105
done

0 commit comments

Comments
 (0)