Skip to content

Commit e277430

Browse files
committed
Attempt to re-use ubuntu-cpp as base image
1 parent 0b5d6f1 commit e277430

1 file changed

Lines changed: 2 additions & 21 deletions

File tree

compose.yaml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ services:
372372
/arrow/ci/scripts/cpp_build.sh /arrow /build &&
373373
/arrow/ci/scripts/cpp_test.sh /arrow /build"
374374

375-
ubuntu-cpp:
375+
ubuntu-cpp: &ubuntu-cpp-base
376376
# Usage:
377377
# docker compose build ubuntu-cpp
378378
# docker compose run --rm ubuntu-cpp
@@ -499,32 +499,13 @@ services:
499499

500500
ubuntu-cpp-odbc:
501501
# Arrow Flight SQL ODBC build with BUNDLED dependencies with downloaded dependencies.
502-
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp
503-
build:
504-
context: .
505-
dockerfile: ci/docker/ubuntu-${UBUNTU}-cpp.dockerfile
506-
cache_from:
507-
- ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp
508-
args:
509-
arch: ${ARCH}
510-
base: "${ARCH}/ubuntu:${UBUNTU}"
511-
clang_tools: ${CLANG_TOOLS}
512-
cmake: ${CMAKE}
513-
gcc: ${GCC}
514-
llvm: ${LLVM}
515-
shm_size: *shm-size
516-
cap_add:
517-
- SYS_ADMIN
518-
security_opt:
519-
- apparmor:unconfined
520-
ulimits: *ulimits
502+
<<: *ubuntu-cpp-base
521503
environment:
522504
<<: [*common, *ccache, *sccache, *cpp]
523505
ARROW_BUILD_TYPE: RELEASE
524506
ARROW_DEPENDENCY_SOURCE: BUNDLED
525507
ARROW_DEPENDENCY_USE_SHARED: OFF
526508
ARROW_FLIGHT_SQL_ODBC: ON
527-
volumes: *ubuntu-volumes
528509
# Register ODBC before running tests
529510
command: >
530511
/bin/bash -c "

0 commit comments

Comments
 (0)