Skip to content

Commit

Permalink
Make tests work again?
Browse files Browse the repository at this point in the history
  • Loading branch information
metaskills committed May 21, 2023
1 parent 67f6c3b commit d3ca869
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM mcr.microsoft.com/vscode/devcontainers/rust
FROM mcr.microsoft.com/vscode/devcontainers/rust:0.202.9-bullseye

RUN sudo apt-get update -y \
&& sudo apt-get upgrade -y \
&& sudo apt-get install -y zip ltrace

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
RUN rustup update \
&& rustup target add aarch64-unknown-linux-gnu

Expand Down
2 changes: 1 addition & 1 deletion amzn/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM public.ecr.aws/sam/build-nodejs18.x

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
ENV PATH="~/.cargo/bin:${PATH}"

RUN ~/.cargo/bin/rustup update \
Expand Down
2 changes: 1 addition & 1 deletion amzn/Dockerfile-arm64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM public.ecr.aws/sam/build-nodejs18.x:latest-arm64

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
ENV PATH="~/.cargo/bin:${PATH}"

RUN ~/.cargo/bin/rustup update \
Expand Down
3 changes: 2 additions & 1 deletion bin/build-arch
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ mkdir -p ./build ./target

cargo build \
--release \
--target "${CRYPTEIA_BUILD_TARGET}"
--target "${CRYPTEIA_BUILD_TARGET}" \
-Z sparse-registry

cp "./target/${CRYPTEIA_BUILD_TARGET}/release/crypteia" "./build/${BIN}"
cp ./target/${CRYPTEIA_BUILD_TARGET}/release/libcrypteia.so "./build/${LIB}"
Expand Down
2 changes: 1 addition & 1 deletion debian/Dockerfile-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apt update && apt-get install -y python3-pip
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
RUN update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
ENV PATH="/root/.cargo/bin:${PATH}"

RUN /root/.cargo/bin/rustup update \
Expand Down

1 comment on commit d3ca869

@metaskills
Copy link
Member Author

Choose a reason for hiding this comment

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

Please sign in to comment.