[native] Install Prestissimo adapters in the dependency image

prestodb · May 29, 2024 · 1b33172 · 1b33172
1 parent 0a0ac8f
commit 1b33172
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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