From 14b191a529bbff59bac110d3f6dc887abc68867a Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@wherobots.com>
Date: Wed, 1 Jan 2025 21:36:37 -0600
Subject: [PATCH] tweaks to docker compose + images

---
 ci/docker/alpine.dockerfile | 2 +-
 ci/scripts/coverage.sh      | 2 +-
 docker-compose.yml          | 6 +-----
 python/.gitignore           | 1 +
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ci/docker/alpine.dockerfile b/ci/docker/alpine.dockerfile
index 9aeb0aa78..c6bdcbcf7 100644
--- a/ci/docker/alpine.dockerfile
+++ b/ci/docker/alpine.dockerfile
@@ -23,7 +23,7 @@ RUN apk add bash linux-headers git cmake R R-dev g++ gfortran gnupg curl py3-vir
 
 # For Arrow C++
 COPY ci/scripts/build-arrow-cpp-minimal.sh /
-RUN /build-arrow-cpp-minimal.sh 18.0.0 /arrow
+RUN /build-arrow-cpp-minimal.sh 18.1.0 /arrow
 
 # There's a missing define that numpy's build needs on s390x and there is no wheel
 RUN (grep -e "S390" /usr/include/bits/hwcap.h && echo "#define HWCAP_S390_VX HWCAP_S390_VXRS" >> /usr/include/bits/hwcap.h) || true
diff --git a/ci/scripts/coverage.sh b/ci/scripts/coverage.sh
index 33599abc8..c22a78560 100755
--- a/ci/scripts/coverage.sh
+++ b/ci/scripts/coverage.sh
@@ -73,7 +73,7 @@ function main() {
     pushd "${SANDBOX_DIR}/nanoarrow"
 
     cmake "${TARGET_NANOARROW_DIR}" \
-          -DNANOARROW_DEVICE=ON -DNANOARROW_IPC=ON \
+          -DNANOARROW_DEVICE=ON -DNANOARROW_IPC=ON -DNANOARROW_IPC_WITH_ZSTD=ON \
           -DNANOARROW_BUILD_TESTS=ON -DNANOARROW_BUILD_TESTS_WITH_ARROW=ON \
           -DNANOARROW_CODE_COVERAGE=ON
     cmake --build .
diff --git a/docker-compose.yml b/docker-compose.yml
index dbba470b2..be7c5adae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,11 +30,7 @@ services:
     command: "/bin/bash /nanoarrow/dev/release/verify-release-candidate.sh $NANOARROW_VERIFY_ARGS"
 
   coverage:
-    build:
-      context: .
-      dockerfile: ci/docker/ubuntu.dockerfile
-      args:
-        NANOARROW_ARCH: ${NANOARROW_ARCH}
+    image: ${REPO}:ubuntu
     volumes:
       # Don't mix the "dev tools" and "source" checkouts
       - ./ci/scripts/coverage.sh:/coverage.sh
diff --git a/python/.gitignore b/python/.gitignore
index 5df1a2b9d..094673629 100644
--- a/python/.gitignore
+++ b/python/.gitignore
@@ -17,6 +17,7 @@
 # under the License.
 
 src/nanoarrow/_*.c
+.mesonpy-*
 
 # Byte-compiled / optimized / DLL files
 __pycache__/