Skip to content

Commit 96d2ced

Browse files
committed
Bump speculos to 0.9.0
1 parent f1c9905 commit 96d2ced

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"ms-vscode.cpptools-extension-pack"
1919
],
2020
"settings": {
21-
"terminal.integrated.defaultProfile.linux": "fish",
21+
"terminal.integrated.defaultProfile.linux": "fish",
2222
"terminal.integrated.shell.linux": {
2323
"fish": {
2424
"path": "/usr/bin/fish"

Dockerfile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# You can find more information here: https://github.com/overcat/ledger-devcontainer
22
FROM ubuntu:24.04
33

4+
ARG ARM_TOOLCHAIN_VERSION=10.3-2021.10
5+
ARG ARM_TOOLCHAIN_AMD64_MD5=2383e4eb4ea23f248d33adc70dc3227e
6+
ARG ARM_TOOLCHAIN_ARM64_MD5=3fe3d8bb693bd0a6e4615b6569443d0d
7+
ARG NANOS_SDK_VERSION=v2.1.0-19
8+
ARG NANOX_SDK_VERSION=v5.11.1
9+
ARG NANOSP_SDK_VERSION=v5.11.1
10+
ARG STAX_SDK_VERSION=v15.4.0
11+
ARG FLEX_SDK_VERSION=v18.3.0
12+
ARG SPECULOS_VERSION=0.9.0
13+
414
# Avoid warnings by switching to noninteractive
515
ENV DEBIAN_FRONTEND=noninteractive
616

@@ -36,10 +46,6 @@ RUN apt-get update && apt-get upgrade -qy && apt-get install -qy \
3646
apt-get autoremove -y && \
3747
apt-get clean
3848

39-
ARG ARM_TOOLCHAIN_VERSION=10.3-2021.10
40-
ARG ARM_TOOLCHAIN_AMD64_MD5=2383e4eb4ea23f248d33adc70dc3227e
41-
ARG ARM_TOOLCHAIN_ARM64_MD5=3fe3d8bb693bd0a6e4615b6569443d0d
42-
4349
# ARM Embedded Toolchain
4450
# Integrity is checked using the MD5 checksum provided by ARM at https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads
4551
RUN case $(uname -m) in \
@@ -64,36 +70,36 @@ ARG GIT_SERVER=https://github.com/LedgerHQ
6470
# Latest Nano S SDK
6571
# Will switch to the unified SDK for next OS release.
6672
ENV NANOS_SDK=/opt/nanos-secure-sdk
67-
RUN git clone --branch v2.1.0-19 --depth 1 "$GIT_SERVER/nanos-secure-sdk.git" "$NANOS_SDK"
73+
RUN git clone --branch ${NANOS_SDK_VERSION} --depth 1 "$GIT_SERVER/nanos-secure-sdk.git" "$NANOS_SDK"
6874

6975
# Unified SDK
7076
ENV LEDGER_SECURE_SDK=/opt/ledger-secure-sdk
7177
RUN git clone "$GIT_SERVER/ledger-secure-sdk.git" "$LEDGER_SECURE_SDK"
7278

7379
# Latest Nano X SDK (OS nanox_2.2.3 => based on API_LEVEL 5)
7480
ENV NANOX_SDK=/opt/nanox-secure-sdk
75-
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOX_SDK" v5.11.1
81+
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOX_SDK" ${NANOX_SDK_VERSION}
7682
RUN echo nanox > $NANOX_SDK/.target
7783

7884
# Latest Nano S+ SDK (OS nanos+_1.1.1 => based on API_LEVEL 5)
7985
ENV NANOSP_SDK=/opt/nanosplus-secure-sdk
80-
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOSP_SDK" v5.11.1
86+
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOSP_SDK" ${NANOSP_SDK_VERSION}
8187
RUN echo nanos2 > $NANOSP_SDK/.target
8288

8389
# Latest Stax SDK (OS stax_1.4.0-rc2 => based on API_LEVEL 15)
8490
ENV STAX_SDK=/opt/stax-secure-sdk
85-
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v15.4.0
91+
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" ${STAX_SDK_VERSION}
8692
RUN echo stax > $STAX_SDK/.target
8793

8894
# Latest Flex SDK (OS flex_0.2.0-rc2 => based on API_LEVEL 18)
8995
ENV FLEX_SDK=/opt/flex-secure-sdk
90-
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" v18.3.0
96+
RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" ${FLEX_SDK_VERSION}
9197
RUN echo flex > $FLEX_SDK/.target
9298

9399
# Default SDK
94100
ENV BOLOS_SDK=$NANOS_SDK
95101

96-
RUN pip3 install --no-cache-dir --break-system-packages ledgerblue speculos==0.8.6
102+
RUN pip3 install --no-cache-dir --break-system-packages ledgerblue speculos==${SPECULOS_VERSION}
97103

98104
# Switch back to dialog for any ad-hoc use of apt-get
99105
ENV DEBIAN_FRONTEND=

0 commit comments

Comments
 (0)