Skip to content

Commit 44d0ea6

Browse files
committed
Enable more feature on published images
1 parent 1fc6b0c commit 44d0ea6

File tree

5 files changed

+29
-6
lines changed

5 files changed

+29
-6
lines changed

.github/workflows/presto-release-publish.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,17 @@ jobs:
398398
working-directory: presto-native-execution
399399
run: |
400400
df -h
401-
docker compose build centos-native-runtime
401+
docker compose build --build-arg EXTRA_CMAKE_FLAGS="
402+
-DPRESTO_ENABLE_PARQUET=ON \
403+
-DPRESTO_ENABLE_REMOTE_FUNCTIONS=ON \
404+
-DPRESTO_ENABLE_JWT=ON \
405+
-DPRESTO_STATS_REPORTER_TYPE=PROMETHEUS \
406+
-DPRESTO_MEMORY_CHECKER_TYPE=LINUX_MEMORY_CHECKER \
407+
-DPRESTO_ENABLE_SPATIAL=ON \
408+
-DPRESTO_ENABLE_TESTING=OFF \
409+
-DPRESTO_ENABLE_S3=ON" \
410+
--build-arg NUM_THREADS=2 \
411+
centos-native-runtime
402412
403413
- name: Add release tag
404414
working-directory: presto-native-execution

presto-native-execution/scripts/dockerfiles/centos-dependency.dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@
1212

1313
FROM quay.io/centos/centos:stream9
1414

15-
ENV PROMPT_ALWAYS_RESPOND=n
15+
# Set this when build arm with common flags
16+
# from https://github.com/facebookincubator/velox/pull/14366
17+
ARG ARM_BUILD_TARGET
18+
19+
ENV PROMPT_ALWAYS_RESPOND=y
1620
ENV CC=/opt/rh/gcc-toolset-12/root/bin/gcc
1721
ENV CXX=/opt/rh/gcc-toolset-12/root/bin/g++
22+
ENV ARM_BUILD_TARGET=${ARM_BUILD_TARGET}
1823

1924
RUN mkdir -p /scripts /velox/scripts
2025
COPY scripts /scripts

presto-native-execution/scripts/dockerfiles/prestissimo-runtime.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ ENV BUILD_DIR=""
2626

2727
RUN mkdir -p /prestissimo /runtime-libraries
2828
COPY . /prestissimo/
29-
RUN EXTRA_CMAKE_FLAGS=${EXTRA_CMAKE_FLAGS} \
30-
NUM_THREADS=${NUM_THREADS} make --directory="/prestissimo/" cmake-and-build BUILD_TYPE=${BUILD_TYPE} BUILD_DIR=${BUILD_DIR} BUILD_BASE_DIR=${BUILD_BASE_DIR}
29+
RUN --mount=type=cache,target=/root/.ccache,sharing=locked \
30+
EXTRA_CMAKE_FLAGS=${EXTRA_CMAKE_FLAGS} \
31+
NUM_THREADS=${NUM_THREADS} make --directory="/prestissimo/" cmake-and-build BUILD_TYPE=${BUILD_TYPE} BUILD_DIR=${BUILD_DIR} BUILD_BASE_DIR=${BUILD_BASE_DIR} && \
32+
ccache -sz -v
3133
RUN !(LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib:/usr/local/lib64 ldd /prestissimo/${BUILD_BASE_DIR}/${BUILD_DIR}/presto_cpp/main/presto_server | grep "not found") && \
3234
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib:/usr/local/lib64 ldd /prestissimo/${BUILD_BASE_DIR}/${BUILD_DIR}/presto_cpp/main/presto_server | awk 'NF == 4 { system("cp " $3 " /runtime-libraries") }'
3335

presto-native-execution/scripts/dockerfiles/ubuntu-22.04-dependency.dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,18 @@ FROM ${base}
1616
# Set a default timezone, can be overriden via ARG
1717
ARG tz="America/New_York"
1818
ARG DEBIAN_FRONTEND="noninteractive"
19-
ENV PROMPT_ALWAYS_RESPOND=n
19+
20+
# Set this when build arm with common flags
21+
# from https://github.com/facebookincubator/velox/pull/14366
22+
ARG ARM_BUILD_TARGET
23+
24+
ENV PROMPT_ALWAYS_RESPOND=y
2025
ENV SUDO=" "
2126
# TZ and DEBIAN_FRONTEND="noninteractive"
2227
# are required to avoid tzdata installation
2328
# to prompt for region selection.
2429
ENV TZ=${tz}
30+
ENV ARM_BUILD_TARGET=${ARM_BUILD_TARGET}
2531

2632
RUN mkdir -p /scripts /velox/scripts
2733
COPY scripts /scripts

presto-native-execution/scripts/setup-adapters.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function install_arrow_flight {
4747
# Arrow Flight enabled. The Velox version of Arrow is used.
4848
# NOTE: benchmarks are on due to a compilation error with v15.0.0, once updated that can be removed
4949
# see https://github.com/apache/arrow/issues/41617
50-
EXTRA_ARROW_OPTIONS=" -DARROW_FLIGHT=ON -DARROW_BUILD_BENCHMARKS=ON "
50+
EXTRA_ARROW_OPTIONS=" -DARROW_FLIGHT=ON -DARROW_BUILD_BENCHMARKS=ON -DgRPC_SOURCE=BUNDLED -DProtobuf_SOURCE=BUNDLED "
5151
install_arrow
5252
}
5353

0 commit comments

Comments
 (0)