From b07cf68ae1122d4331b711f8c58feb811bdfc384 Mon Sep 17 00:00:00 2001 From: Rainer Koirikivi Date: Tue, 1 Oct 2024 00:33:11 +0300 Subject: [PATCH] Add manylinux arm64 wheel for pyord, + casing fixes --- bridge_node/Dockerfile | 6 +++--- bridge_node/poetry.lock | 1 + docker/ord/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bridge_node/Dockerfile b/bridge_node/Dockerfile index 4170a0e..b9ddca1 100644 --- a/bridge_node/Dockerfile +++ b/bridge_node/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-slim-bookworm as base +FROM python:3.11-slim-bookworm AS base WORKDIR /srv/bridge_backend @@ -14,7 +14,7 @@ RUN apt-get update -y && apt-get --no-install-recommends -y install \ libsecp256k1-dev \ && rm -rf /var/lib/apt/lists/* -FROM base as builder +FROM base AS builder RUN apt-get update -y && apt-get --no-install-recommends -y install \ libpq-dev \ @@ -36,7 +36,7 @@ COPY . . RUN poetry build && ./.venv/bin/pip install dist/*.whl # Discard build stage and only copy the packages to the final image -FROM base as final +FROM base AS final COPY --from=builder /srv/bridge_backend/.venv ./.venv COPY --from=builder /srv/bridge_backend/dist . diff --git a/bridge_node/poetry.lock b/bridge_node/poetry.lock index 1675c41..0e93755 100644 --- a/bridge_node/poetry.lock +++ b/bridge_node/poetry.lock @@ -1872,6 +1872,7 @@ files = [ {file = "pyord-0.3.0-cp38-abi3-macosx_10_12_x86_64.whl", hash = "sha256:fe51dda4f8ab588140ba3c740e03596ea6cb4d9cfafba5535b28e7ba620856eb"}, {file = "pyord-0.3.0-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d7589c0b4ec738f408b2f47f369c0a91fde957d3732e6b726ca886b11a3f0c4b"}, {file = "pyord-0.3.0-cp38-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fae813445e21adfaa881fc7d7331f94de1369f4f9a18048a39ca37c8c2e0deb3"}, + {file = "pyord-0.3.0-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a760d2bb4c16f5cac04187202006aa95a3165467a6dc057e6a21317b781f1520"}, {file = "pyord-0.3.0.tar.gz", hash = "sha256:19ba93510109a760599acdc8c237e3cef4ebaf7753bf12e87c7b85635155003f"}, ] diff --git a/docker/ord/Dockerfile b/docker/ord/Dockerfile index d382241..d83a778 100644 --- a/docker/ord/Dockerfile +++ b/docker/ord/Dockerfile @@ -1,5 +1,5 @@ # Forked from https://github.com/ordinals/ord/blob/master/Dockerfile -FROM rust:1.76.0-bookworm as builder +FROM rust:1.76.0-bookworm AS builder ARG ORD_GIT_CHECKOUT="0.18.2" ARG ORD_GIT_URL="https://github.com/ordinals/ord"