Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cargo ledger setup step to full / legacy images. #86

Merged
merged 1 commit into from
Oct 3, 2023
Merged

Add cargo ledger setup step to full / legacy images. #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.6.0] - 2023-09-18

### Added
- Add `cargo ledger setup` step in full/legacy images so users don't have to do it.

### Changed
- Update curl installation step in full image (work around of https://github.com/curl/curl/issues/11917).
- Remove curl installation from dev-tools image (already installed in full image).

## [3.5.0] - 2023-09-18

Expand Down
1 change: 0 additions & 1 deletion dev-tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ RUN apk add libusb \
py3-qt5 \
qemu-arm \
jq \
curl \
tesseract-ocr \
mesa-dri-gallium

Expand Down
5 changes: 4 additions & 1 deletion full/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG RUST_STABLE_VERSION=1.72.0
ARG RUST_NIGHTLY_VERSION=nightly-2022-12-02

# Add curl for Rust buildchain
RUN apk add curl
RUN apk add --update-cache --upgrade curl

# Define rustup/cargo home directories
ENV RUSTUP_HOME=/opt/rustup \
Expand All @@ -29,3 +29,6 @@ RUN rustup component add rust-src --toolchain $RUST_NIGHTLY_VERSION

# Add cargo ledger (needs a version of Rust >= 1.70)
RUN cargo +$RUST_STABLE_VERSION install --locked --git=https://github.com/LedgerHQ/cargo-ledger.git --rev 1.1.0 cargo-ledger

# Setup cargo ledger (install JSON target files)
RUN cargo ledger setup
3 changes: 3 additions & 0 deletions legacy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ RUN rustup component add rust-src --toolchain $RUST_NIGHTLY_VERSION
# Add cargo ledger (needs a version of Rust >= 1.70)
RUN cargo +$RUST_STABLE_VERSION install --locked --git=https://github.com/LedgerHQ/cargo-ledger.git --rev 1.1.0 cargo-ledger

# Setup cargo ledger (install JSON target files)
RUN cargo ledger setup

# Adding LLVM-15 APT repository and installing it
RUN wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN add-apt-repository -y "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
Expand Down