Skip to content

Commit 283fdda

Browse files
committed
Try another workaround for armv6 and armv7
1 parent 92c33c4 commit 283fdda

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

docker/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ WORKDIR /workdir
66
ARG RUST_PYTHON_VERSION="0.2.0"
77
ENV CARGO_HOME="/workdir"
88
ENV CARGO_INSTALL_ROOT="/workdir"
9+
# armv6 and armv7 fix
10+
ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
911

1012
# Newer rust needed due to let...else feature
1113
RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community rust cargo
@@ -23,11 +25,6 @@ RUN mkdir /workdir/rp__doc__/ && tar --strip-components=1 -C /workdir/rp__doc__/
2325
RUN tar --strip-components=1 -C /workdir -xzf /tmp/v$RUST_PYTHON_VERSION.tar.gz
2426
RUN git apply /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
2527

26-
# armv6 and armv7 fix
27-
# See: https://github.com/rust-lang/cargo/issues/6513#issuecomment-1425753938
28-
# See: https://github.com/rust-lang/cargo/issues/6513
29-
RUN git fetch --force --update-head-ok https://github.com/rust-lang/crates.io-index +HEAD:refs/remotes/origin/HEAD -v
30-
3128
# Remove the git mode that triggers an error on armv6 and armv7
3229
# Ref: https://github.com/rust-lang/cargo/issues/2808 (failed to mmap. Could not write data: Out of memory; class=Os (2))
3330
RUN sed -i 's#{ git = .*#{ path = "/workdir/rp__doc__/" }#' /workdir/derive-impl/Cargo.toml

0 commit comments

Comments
 (0)