From 76388a6c0b80bcdadac4e61da472f2b690d1feee Mon Sep 17 00:00:00 2001 From: bo0tzz Date: Mon, 27 Nov 2023 11:54:30 +0000 Subject: [PATCH] Enable multiarch build --- .github/workflows/docker.yml | 3 +-- Dockerfile | 10 +++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 757c0f2..55c25ed 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -78,8 +78,7 @@ jobs: uses: docker/build-push-action@v4.1.1 with: context: . - # TODO: Enable multiarch build - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 push: ${{ !github.event.pull_request }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/Dockerfile b/Dockerfile index 80446cd..7222a13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,18 @@ ARG CNPG_TAG -FROM ghcr.io/cloudnative-pg/postgresql:$CNPG_TAG +FROM curlimages/curl AS download ARG PG_MAJOR ARG PGVECTORS_TAG -ARG ARCH=x86_64 + +WORKDIR /download +RUN curl -o pgvectors.deb -sSL https://github.com/tensorchord/pgvecto.rs/releases/download/$PGVECTORS_TAG/vectors-pg$PG_MAJOR-$PGVECTORS_TAG-$(uname -m)-unknown-linux-gnu.deb + +FROM ghcr.io/cloudnative-pg/postgresql:$CNPG_TAG # drop to root to install packages USER root -ADD https://github.com/tensorchord/pgvecto.rs/releases/download/$PGVECTORS_TAG/vectors-pg$PG_MAJOR-$PGVECTORS_TAG-$ARCH-unknown-linux-gnu.deb ./pgvectors.deb +COPY --from=download /download/pgvectors.deb ./pgvectors.deb RUN apt install ./pgvectors.deb USER postgres