Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix docker build OOMing in CI for arm64 builds #14173

Merged
merged 5 commits into from
Oct 13, 2022
Merged

Fix docker build OOMing in CI for arm64 builds #14173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
083c9d8
Fix docker build OOMing in CI for amr64 builds
erikjohnston Oct 13, 2022
78c5952
Newsfile
erikjohnston Oct 13, 2022
0c17555
Fix newsfile
erikjohnston Oct 13, 2022
b2850a2
Actually set the env
erikjohnston Oct 13, 2022
2b69f83
Fix x64 build: build arg defaults to false
Oct 13, 2022
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
5 changes: 4 additions & 1 deletion .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: Inspect builder
run: docker buildx inspect

- name: Log in to DockerHub
uses: docker/login-action@v2
with:
Expand Down Expand Up @@ -55,3 +55,6 @@ jobs:
tags: "${{ steps.set-tag.outputs.tags }}"
file: "docker/Dockerfile"
platforms: linux/amd64,linux/arm64
build-args:
# arm64 builds OOM otherwise. c.f. https://github.com/rust-lang/cargo/issues/10583
CARGO_NET_GIT_FETCH_WITH_CLI: true
1 change: 1 addition & 0 deletions changelog.d/14173.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix docker build OOMing in CI for arm64 builds.
6 changes: 6 additions & 0 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ RUN mkdir /rust /cargo

RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable


# arm64 builds consume a lot of memory if `CARGO_NET_GIT_FETCH_WITH_CLI` is not
# set to true, so we expose it as a build-arg.
ARG CARGO_NET_GIT_FETCH_WITH_CLI=false
ENV CARGO_NET_GIT_FETCH_WITH_CLI=$CARGO_NET_GIT_FETCH_WITH_CLI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

er, note that ENV defines a variable that will be present in containers started from the final image, which I don't think is really what you want here.

(I guess it won't do any harm, but it does seem like an odd variable for us to export to our image).

Instead you have to do CARGO_NET_GIT_FETCH_WITH_CLI=$CARGO_NET_GIT_FETCH_WITH_CLI before the pip that needs it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, though ENV should only affect the current build stage and so not be in the final image.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes, fair


# To speed up rebuilds, install all of the dependencies before we copy over
# the whole synapse project, so that this layer in the Docker cache can be
# used while you develop on the source
Expand Down