Add adapters docker compose

facebookincubator · May 30, 2024 · 5380375 · 5380375
1 parent 7d5919f
commit 5380375
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/.github/workflows/build-metrics.yml b/.github/workflows/build-metrics.yml
@@ -37,7 +37,7 @@ jobs:
     name: Linux ${{ matrix.type }} with adapters
     if: ${{ github.repository == 'facebookincubator/velox' }}
     runs-on: ${{ matrix.runner }}
-    container: ghcr.io/facebookincubator/velox-dev:adapters
+    container: docker.io/majetideepak4/velox:adapters9
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -52,7 +52,7 @@ jobs:
     # prevent errors when forks ff their main branch
     if: ${{ github.repository == 'facebookincubator/velox' }}
     runs-on: 8-core
-    container: ghcr.io/facebookincubator/velox-dev:adapters
+    container: docker.io/majetideepak4/velox:adapters9
     defaults:
       run:
         shell: bash

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,19 +33,43 @@ services:
       - .:/velox:delegated
     command: scripts/docker-command.sh
 
+  adapters-cpp:
+    # Usage:
+    #   docker-compose pull adapters-cpp or docker-compose build adapters-cpp
+    #   or
+    #   docker-compose run --rm adapters-cpp
+    #   or
+    #   docker-compose run -e NUM_THREADS=<NUMBER_OF_THREADS_TO_USE> --rm adapters-cpp
+    #   to set the number of threads used during compilation
+    image: ghcr.io/facebookincubator/velox-dev:adapters
+    build:
+      context: .
+      dockerfile: scripts/adapters.dockerfile
+      args:
+        image: ghcr.io/facebookincubator/velox-dev:centos9
+    environment:
+      NUM_THREADS: 8 # default value for NUM_THREADS
+      CCACHE_DIR: "/velox/.ccache"
+      EXTRA_CMAKE_FLAGS: -DVELOX_ENABLE_PARQUET=ON 
+                         -DVELOX_ENABLE_S3=ON
+    volumes:
+      - .:/velox:delegated
+    working_dir: /velox
+    command: /velox/scripts/docker-command.sh
+
   centos-cpp:
     # Usage:
     #   docker-compose pull centos-cpp or docker-compose build centos-cpp
     #   docker-compose run --rm centos-cpp
     #   or
     #   docker-compose run -e NUM_THREADS=<NUMBER_OF_THREADS_TO_USE> --rm centos-cpp
     #   to set the number of threads used during compilation
-    image: ghcr.io/facebookincubator/velox-dev:centos9
+    image: ghcr.io/facebookincubator/velox-dev:centos8
     build:
       context: .
       dockerfile: scripts/centos.dockerfile
       args:
-        image: quay.io/centos/centos:stream9 
+        image: quay.io/centos/centos:stream8 
     environment:
       NUM_THREADS: 8 # default value for NUM_THREADS
       CCACHE_DIR: "/velox/.ccache"

diff --git a/scripts/adapters.dockerfile b/scripts/adapters.dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # Build the test and build container for presto_cpp
-ARG image=docker.io/majetideepak/velox:centos9
+ARG image=ghcr.io/facebookincubator/velox-dev:centos9
 FROM $image
 ARG cpu_target=avx
 ENV CPU_TARGET=$cpu_target

diff --git a/scripts/setup-adapters.sh b/scripts/setup-adapters.sh
@@ -169,12 +169,12 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
       # Dependencies of Azure Storage Blob cpp
       apt install -y openssl
    else # Assume Fedora/CentOS
-      yum -y install libxml2-devel libgsasl-devel libuuid-devel
+      dnf -y install libxml2-devel libgsasl-devel libuuid-devel krb5-devel
       # Dependencies of GCS, probably a workaround until the docker image is rebuilt
-      yum -y install curl-devel c-ares-devel
+      dnf -y install npm curl-devel c-ares-devel
       # Dependencies of Azure Storage Blob Cpp
-      yum -y install perl-IPC-Cmd
-      yum -y install openssl
+      dnf -y install perl-IPC-Cmd
+      dnf -y install openssl
    fi
 fi