Skip to content

Refine ARM64 multi-arch Docker builds and dev workflow #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdecker merged 3 commits into from
Apr 22, 2025
Merged

Refine ARM64 multi-arch Docker builds and dev workflow #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f912e42
makefile: dev dependency retrieval of build-self
YusukeShimizu Apr 22, 2025
040373f
docs: pytest command to use 'uv run'
YusukeShimizu Apr 22, 2025
32d7907
gltesting: use correct bins for each arch
YusukeShimizu Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ gen: ${GENALL}

build-self: ensure-docker
cargo build --all
uv sync --package gl-client --extra dev
uv sync --package gl-client --group dev

check-all: check-rs check-self check-py check-testing-py

Expand Down
16 changes: 12 additions & 4 deletions docker/gl-testing/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,18 @@ RUN chmod a+rwx -R $CARGO_HOME
# Downloads bitcoin-core
FROM ubuntu:22.04 AS bitcoin-downloader
RUN apt update && apt install -qqy wget
ARG TARGETPLATFORM

ARG BITCOIN_VERSION=25.0

RUN cd /tmp/ && \
wget "https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz" -O bitcoin.tar.gz && \
RUN PLATFORM=$( \
case ${TARGETPLATFORM} in \
linux/amd64 ) echo "x86_64";; \
linux/arm64 ) echo "aarch64";; \
esac \
) && \
cd /tmp/ && \
wget "https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-${PLATFORM}-linux-gnu.tar.gz" -O bitcoin.tar.gz && \
tar -xvzf bitcoin.tar.gz && \
mv /tmp/bitcoin-$BITCOIN_VERSION/ /opt/bitcoin && \
rm -rf bitcoin.tar.gz /tmp/bitcoin-$BITCOIN_VERSION
Expand All @@ -97,12 +104,13 @@ RUN cd /tmp/ && \
# --------------------------------------
# Downloads cloudlfares SSL binaries
FROM ubuntu:22.04 AS cfssl-downloader
ARG TARGETARCH

RUN apt update && apt install -qqy wget

RUN wget -q https://github.com/cloudflare/cfssl/releases/download/v1.5.0/cfssl_1.5.0_linux_amd64 -O /usr/bin/cfssl && \
RUN wget -q https://github.com/cloudflare/cfssl/releases/download/v1.6.5/cfssl_1.6.5_linux_${TARGETARCH} -O /usr/bin/cfssl && \
chmod a+x /usr/bin/cfssl
RUN wget -q https://github.com/cloudflare/cfssl/releases/download/v1.5.0/cfssljson_1.5.0_linux_amd64 -O /usr/bin/cfssljson && \
RUN wget -q https://github.com/cloudflare/cfssl/releases/download/v1.6.5/cfssljson_1.6.5_linux_${TARGETARCH} -O /usr/bin/cfssljson && \
chmod a+x /usr/bin/cfssljson

# ----------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions docs/src/tutorials/testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ the flags `-v` for a verbose output and `-s` to print all output to
the console instead of capturing it.

```
pytest -v -s my-first-test.py
uv run pytest -v -s my-first-test.py
```

This should produce a lot of output, with the last few lines reading
Expand Down Expand Up @@ -457,7 +457,7 @@ make docker-shell
We can start our `pytest` test now. Remember the options `-v` and `-s`
to print the logs to stdout instead of capturing them.
```bash
pytest -vs my-first-test.py
uv run pytest -vs my-first-test.py
```

After the test is finished you should see `passed` in the terminal.
Expand Down Expand Up @@ -517,7 +517,7 @@ make docker-shell

Then we can start our REPL form inside the docker-shell.
```bash
pytest -s examples/setup_repl.py
uv run pytest -s examples/python/setup_repl.py
```

You will see an output that looks similar to the following lines:
Expand Down
Loading