From 1b33172d4b594d0720162ee9a65bd36732eb73ea Mon Sep 17 00:00:00 2001 From: Deepak Majeti Date: Tue, 28 May 2024 03:20:28 +0530 Subject: [PATCH] [native] Install Prestissimo adapters in the dependency image --- presto-native-execution/docker-compose.yml | 8 ++++++-- .../dockerfiles/centos-8-stream-dependency.dockerfile | 4 +++- .../dockerfiles/ubuntu-22.04-dependency.dockerfile | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/presto-native-execution/docker-compose.yml b/presto-native-execution/docker-compose.yml index 93ae8a84f2ae6..f122b0666003f 100644 --- a/presto-native-execution/docker-compose.yml +++ b/presto-native-execution/docker-compose.yml @@ -31,7 +31,9 @@ services: - DEPENDENCY_IMAGE=presto/prestissimo-dependency:amd64-ubuntu-22.04 - BASE_IMAGE=amd64/ubuntu:22.04 - OSNAME=ubuntu - - EXTRA_CMAKE_FLAGS=-DPRESTO_ENABLE_TESTING=OFF -DPRESTO_ENABLE_PARQUET=ON -DPRESTO_ENABLE_S3=ON + - EXTRA_CMAKE_FLAGS=-DPRESTO_ENABLE_TESTING=OFF \ + -DPRESTO_ENABLE_PARQUET=ON \ + -DPRESTO_ENABLE_S3=ON context: . dockerfile: scripts/dockerfiles/prestissimo-runtime.dockerfile environment: @@ -53,7 +55,9 @@ services: image: presto/prestissimo-runtime:centos8 build: args: - - EXTRA_CMAKE_FLAGS=-DPRESTO_ENABLE_TESTING=OFF -DPRESTO_ENABLE_PARQUET=ON -DPRESTO_ENABLE_S3=ON + - EXTRA_CMAKE_FLAGS=-DPRESTO_ENABLE_TESTING=OFF \ + -DPRESTO_ENABLE_PARQUET=ON \ + -DPRESTO_ENABLE_S3=ON context: . dockerfile: scripts/dockerfiles/prestissimo-runtime.dockerfile environment: diff --git a/presto-native-execution/scripts/dockerfiles/centos-8-stream-dependency.dockerfile b/presto-native-execution/scripts/dockerfiles/centos-8-stream-dependency.dockerfile index 32b1c27b4fd88..66c5771b1f2f3 100644 --- a/presto-native-execution/scripts/dockerfiles/centos-8-stream-dependency.dockerfile +++ b/presto-native-execution/scripts/dockerfiles/centos-8-stream-dependency.dockerfile @@ -20,5 +20,7 @@ RUN mkdir -p /scripts /velox/scripts COPY scripts /scripts COPY velox/scripts /velox/scripts RUN mkdir build && \ - (cd build && ../scripts/setup-centos.sh && ../velox/scripts/setup-adapters.sh aws) && \ + (cd build && ../scripts/setup-centos.sh && \ + ../velox/scripts/setup-adapters.sh aws && \ + ../scripts/setup-adapters.sh ) && \ rm -rf build diff --git a/presto-native-execution/scripts/dockerfiles/ubuntu-22.04-dependency.dockerfile b/presto-native-execution/scripts/dockerfiles/ubuntu-22.04-dependency.dockerfile index 00d8607298051..03473c874d075 100644 --- a/presto-native-execution/scripts/dockerfiles/ubuntu-22.04-dependency.dockerfile +++ b/presto-native-execution/scripts/dockerfiles/ubuntu-22.04-dependency.dockerfile @@ -28,5 +28,8 @@ COPY scripts /scripts COPY velox/scripts /velox/scripts # setup-adapters.sh does not install rpm needed for minio install. RUN mkdir build && \ - (cd build && ../scripts/setup-ubuntu.sh && apt install -y rpm && ../velox/scripts/setup-adapters.sh aws) && \ + (cd build && ../scripts/setup-ubuntu.sh && \ + apt install -y rpm && \ + ../velox/scripts/setup-adapters.sh aws && \ + ../scripts/setup-adapters.sh ) && \ rm -rf build