This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-nanoarrow.git
The following commit(s) were added to refs/heads/main by this push:
new 6e596bd chore: Use manifest ubuntu image for non-platform specific
compose services (#275)
6e596bd is described below
commit 6e596bdc7116af8307bad756cd5bb6147f8a0494
Author: Dewey Dunnington <[email protected]>
AuthorDate: Mon Aug 14 14:53:36 2023 -0300
chore: Use manifest ubuntu image for non-platform specific compose services
(#275)
Before, running `docker compose run --rm docs` crashed because `pandoc`
doesn't work with docker's emulation for whatever reason. Now that the
manifest image works, we can use it for those types of workflows (I left
out verify because that one should pretty much always be
platform-specific).
---
docker-compose.yml | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a736af..a772897 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,14 +32,7 @@ services:
command: "/bin/bash /nanoarrow/dev/release/verify-release-candidate.sh
$NANOARROW_VERIFY_ARGS"
coverage:
- image: ${REPO}:ubuntu-${NANOARROW_ARCH}
- build:
- context: .
- cache_from:
- - ${REPO}:ubuntu-${NANOARROW_ARCH}
- 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
@@ -47,14 +40,7 @@ services:
command: "/bin/bash /coverage.sh /nanoarrow"
docs:
- image: ${REPO}:ubuntu-${NANOARROW_ARCH}
- build:
- context: .
- cache_from:
- - ${REPO}:ubuntu-${NANOARROW_ARCH}
- 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/build-docs.sh:/build-docs.sh
