Skip to content

Commit d51c3ec

Browse files
authored
Merge branch 'main' into keys-add-hd-path-plain-seed
2 parents 008c002 + 98e39fc commit d51c3ec

4 files changed

Lines changed: 10 additions & 22 deletions

File tree

Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM rust:latest
33
RUN rustup target add wasm32v1-none
44

55
RUN apt-get update && \
6-
apt-get install -y --no-install-recommends dbus gnome-keyring libdbus-1-3 libudev1 libssl3 && \
6+
apt-get install -y --no-install-recommends libudev1 libssl3 && \
77
rm -rf /var/lib/apt/lists/*
88

99
ARG TARGETARCH
@@ -12,11 +12,9 @@ COPY stellar-${TARGETARCH}/stellar /usr/local/bin/stellar
1212
ENV STELLAR_CONFIG_HOME=/config
1313
ENV STELLAR_DATA_HOME=/data
1414

15-
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
16-
RUN chmod +x /usr/local/bin/entrypoint.sh && \
17-
chmod +x /usr/local/bin/stellar
15+
RUN chmod +x /usr/local/bin/stellar
1816

1917
WORKDIR /source
2018

21-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh", "stellar"]
19+
ENTRYPOINT ["/usr/local/bin/stellar"]
2220
CMD []

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ ifeq ($(shell uname -s),Darwin)
2525
MACOS_MIN_VER = -ldflags='-extldflags -mmacosx-version-min=13.0'
2626
endif
2727

28-
install_rust: install
29-
3028
install:
3129
cargo install --force --locked --path ./cmd/stellar-cli --debug
30+
31+
build-fixtures:
3232
cargo install --force --locked --path ./cmd/crates/soroban-test/tests/fixtures/hello --root ./target --debug --quiet
3333
cargo install --force --locked --path ./cmd/crates/soroban-test/tests/fixtures/bye --root ./target --debug --quiet
3434

@@ -41,7 +41,7 @@ build:
4141
build-test-wasms:
4242
cargo build --package 'test_*' --profile test-wasms --target wasm32v1-none
4343

44-
build-test: build-test-wasms install
44+
build-test: build-test-wasms build-fixtures install
4545

4646
docs:
4747
cargo run --package doc-gen --features additional-libs

docker/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ docker run --rm -it \
3838
stellar/stellar-cli contract build
3939
```
4040

41+
### Secure Store Keys
42+
43+
The image does not include a system keyring, so `stellar keys` operations using `--secure-store` are not supported inside the container. Use file-based keys (the default) instead.
44+
4145
## Container Paths
4246

4347
| Path | Description |

entrypoint.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)