Skip to content

Commit 3f8e774

Browse files
committed
Copy linux toolchain to devcontainer, fix shell issues
1 parent f88a5cd commit 3f8e774

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

.github/.devcontainer/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ENV PATH=$PATH:/opt/riscv/bin:/opt/sail-riscv
2424

2525
COPY --from=ghcr.io/object-object/mlogv32-riscv-gnu-toolchain:rv32ima-ilp32 /opt/riscv /opt/riscv
2626

27+
COPY --from=ghcr.io/object-object/mlogv32-riscv-gnu-toolchain:rv32ima-ilp32-linux /opt/riscv /opt/riscv
28+
2729
COPY --from=build-sail /opt/sail-riscv /opt/sail-riscv
2830

2931
# https://code.visualstudio.com/remote/advancedcontainers/persist-bash-history
@@ -34,6 +36,12 @@ RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhisto
3436
&& touch /commandhistory/.bash_history \
3537
&& chown -R $USERNAME /commandhistory \
3638
&& echo "$SNIPPET" >> "/home/$USERNAME/.bashrc"
39+
&& sed -i '^/__bash_prompt$/d' "/home/$USERNAME/.bashrc"
40+
# ^ fix weird issues with shell not handling line wrapping
41+
42+
# buildroot dependencies
43+
RUN apt-get update \
44+
&& apt-get install -y --no-install-recommends cpio bc
3745

3846
# avoid permission issues with cargo if cargo install runs as root
3947
USER ${USERNAME}

0 commit comments

Comments
 (0)