Skip to content

Commit 77ae3c1

Browse files
Fix missing Dockerfile ARG, Update Rust to 1.49.0 (#67)
* Fix missing Dockerfile ARG Docker ARG REPOS_FILE was not redeclared in the "cacher" build stage, and so was not inheriting the default value specified at the top of the file. This redeclares the arg in the "cacher" build stage, so that the default value may be used. * Update Rust in Dockerfile to 1.49.0 rclrs_examples fail to compile due to the following error ``` error[E0658]: use of unstable library feature 'renamed_spin_loop' --> /usr/local/cargo/registry/src/github.com-1ecc6299db9ec823/spin-0.9.2/src/relax.rs:26:9 | 26 | core::hint::spin_loop(); | ^^^^^^^^^^^^^^^^^^^^^ | = note: see issue #55002 <rust-lang/rust#55002> for more information Compiling bitvec v0.19.5 error: aborting due to previous error ``` As seen in the noted link, updating Rust can resolve the issue. This updates Rust in the Dockerfile to 1.49.0, where the issue seems to be resolved.
1 parent 86867ec commit 77ae3c1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM $FROM_IMAGE AS cacher
2121

2222
# clone overlay source
2323
ARG OVERLAY_WS
24+
ARG REPOS_FILE
2425
WORKDIR $OVERLAY_WS/src
2526
COPY ./${REPOS_FILE} ../
2627
RUN vcs import ./ < ../${REPOS_FILE} && \
@@ -53,7 +54,7 @@ RUN apt-get update && apt-get install -q -y \
5354
ENV RUSTUP_HOME=/usr/local/rustup \
5455
CARGO_HOME=/usr/local/cargo \
5556
PATH=/usr/local/cargo/bin:$PATH \
56-
RUST_VERSION=1.47.0
57+
RUST_VERSION=1.49.0
5758
RUN set -eux; \
5859
wget -O rustup-init "https://sh.rustup.rs"; \
5960
chmod +x rustup-init; \

0 commit comments

Comments
 (0)