Skip to content

Commit 4916e57

Browse files
committed
fix(docker): add openshell-prover to Dockerfile skeleton stages
The openshell-prover crate was added as a dependency of openshell-cli in #741 but the Docker build infrastructure was not updated. Cargo workspace resolution requires every crate manifest to be present even when only building a subset of packages. Add openshell-prover Cargo.toml, mkdir, and stub lib.rs to the skeleton stages of all affected Dockerfiles. Also add the previously missing openshell-policy and openshell-tui entries to the python-wheels Dockerfiles where they were absent.
1 parent 79e6f73 commit 4916e57

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

deploy/docker/Dockerfile.cli-macos

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,28 @@ COPY crates/openshell-core/Cargo.toml crates/openshell-core/Cargo.toml
6161
COPY crates/openshell-policy/Cargo.toml crates/openshell-policy/Cargo.toml
6262
COPY crates/openshell-providers/Cargo.toml crates/openshell-providers/Cargo.toml
6363
COPY crates/openshell-tui/Cargo.toml crates/openshell-tui/Cargo.toml
64+
COPY crates/openshell-prover/Cargo.toml crates/openshell-prover/Cargo.toml
6465
COPY crates/openshell-core/build.rs crates/openshell-core/build.rs
6566
COPY proto/ proto/
6667

6768
# Scope workspace to CLI crates only — avoids compiling aws-lc-sys (pulled
6869
# by russh in openshell-sandbox/openshell-server) which is difficult to
6970
# cross-compile and unnecessary for the CLI binary.
70-
RUN sed -i 's|members = \["crates/\*"\]|members = ["crates/openshell-cli", "crates/openshell-core", "crates/openshell-bootstrap", "crates/openshell-policy", "crates/openshell-providers", "crates/openshell-tui"]|' Cargo.toml
71+
RUN sed -i 's|members = \["crates/\*"\]|members = ["crates/openshell-cli", "crates/openshell-core", "crates/openshell-bootstrap", "crates/openshell-policy", "crates/openshell-prover", "crates/openshell-providers", "crates/openshell-tui"]|' Cargo.toml
7172

7273
RUN mkdir -p crates/openshell-cli/src \
7374
crates/openshell-core/src \
7475
crates/openshell-bootstrap/src \
7576
crates/openshell-policy/src \
7677
crates/openshell-providers/src \
78+
crates/openshell-prover/src \
7779
crates/openshell-tui/src && \
7880
echo "fn main() {}" > crates/openshell-cli/src/main.rs && \
7981
touch crates/openshell-core/src/lib.rs && \
8082
touch crates/openshell-bootstrap/src/lib.rs && \
8183
touch crates/openshell-policy/src/lib.rs && \
8284
touch crates/openshell-providers/src/lib.rs && \
85+
touch crates/openshell-prover/src/lib.rs && \
8386
touch crates/openshell-tui/src/lib.rs
8487

8588
RUN --mount=type=cache,id=cargo-registry-cli-macos,sharing=locked,target=/root/.cargo/registry \

deploy/docker/Dockerfile.images

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ COPY crates/openshell-router/Cargo.toml crates/openshell-router/Cargo.toml
5454
COPY crates/openshell-sandbox/Cargo.toml crates/openshell-sandbox/Cargo.toml
5555
COPY crates/openshell-server/Cargo.toml crates/openshell-server/Cargo.toml
5656
COPY crates/openshell-tui/Cargo.toml crates/openshell-tui/Cargo.toml
57+
COPY crates/openshell-prover/Cargo.toml crates/openshell-prover/Cargo.toml
5758
COPY crates/openshell-core/build.rs crates/openshell-core/build.rs
5859
COPY proto/ proto/
5960

@@ -67,6 +68,7 @@ RUN mkdir -p \
6768
crates/openshell-router/src \
6869
crates/openshell-sandbox/src \
6970
crates/openshell-server/src \
71+
crates/openshell-prover/src \
7072
crates/openshell-tui/src && \
7173
touch crates/openshell-bootstrap/src/lib.rs && \
7274
printf 'fn main() {}\n' > crates/openshell-cli/src/main.rs && \
@@ -79,6 +81,7 @@ RUN mkdir -p \
7981
printf 'fn main() {}\n' > crates/openshell-sandbox/src/main.rs && \
8082
touch crates/openshell-server/src/lib.rs && \
8183
printf 'fn main() {}\n' > crates/openshell-server/src/main.rs && \
84+
touch crates/openshell-prover/src/lib.rs && \
8285
touch crates/openshell-tui/src/lib.rs
8386

8487
FROM rust-builder-skeleton AS rust-deps

deploy/docker/Dockerfile.python-wheels

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,25 @@ COPY crates/openshell-router/Cargo.toml crates/openshell-router/Cargo.toml
4646
COPY crates/openshell-sandbox/Cargo.toml crates/openshell-sandbox/Cargo.toml
4747
COPY crates/openshell-server/Cargo.toml crates/openshell-server/Cargo.toml
4848
COPY crates/openshell-bootstrap/Cargo.toml crates/openshell-bootstrap/Cargo.toml
49+
COPY crates/openshell-policy/Cargo.toml crates/openshell-policy/Cargo.toml
50+
COPY crates/openshell-prover/Cargo.toml crates/openshell-prover/Cargo.toml
51+
COPY crates/openshell-tui/Cargo.toml crates/openshell-tui/Cargo.toml
4952
COPY crates/openshell-core/build.rs crates/openshell-core/build.rs
5053
COPY proto/ proto/
5154

5255
# Create dummy source files to build dependencies.
53-
RUN mkdir -p crates/openshell-cli/src crates/openshell-core/src crates/openshell-ocsf/src crates/openshell-providers/src crates/openshell-router/src crates/openshell-sandbox/src crates/openshell-server/src crates/openshell-bootstrap/src && \
56+
RUN mkdir -p crates/openshell-cli/src crates/openshell-core/src crates/openshell-ocsf/src crates/openshell-policy/src crates/openshell-providers/src crates/openshell-prover/src crates/openshell-router/src crates/openshell-sandbox/src crates/openshell-server/src crates/openshell-bootstrap/src crates/openshell-tui/src && \
5457
echo "fn main() {}" > crates/openshell-cli/src/main.rs && \
5558
echo "fn main() {}" > crates/openshell-sandbox/src/main.rs && \
5659
echo "fn main() {}" > crates/openshell-server/src/main.rs && \
5760
touch crates/openshell-core/src/lib.rs && \
5861
touch crates/openshell-ocsf/src/lib.rs && \
5962
touch crates/openshell-providers/src/lib.rs && \
6063
touch crates/openshell-router/src/lib.rs && \
61-
touch crates/openshell-bootstrap/src/lib.rs
64+
touch crates/openshell-bootstrap/src/lib.rs && \
65+
touch crates/openshell-policy/src/lib.rs && \
66+
touch crates/openshell-prover/src/lib.rs && \
67+
touch crates/openshell-tui/src/lib.rs
6268

6369
# Build dependencies only (cached unless Cargo.toml/lock changes).
6470
# sccache uses memcached in CI or the local disk cache mount for local dev.

deploy/docker/Dockerfile.python-wheels-macos

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,25 @@ COPY crates/openshell-router/Cargo.toml crates/openshell-router/Cargo.toml
5454
COPY crates/openshell-sandbox/Cargo.toml crates/openshell-sandbox/Cargo.toml
5555
COPY crates/openshell-server/Cargo.toml crates/openshell-server/Cargo.toml
5656
COPY crates/openshell-bootstrap/Cargo.toml crates/openshell-bootstrap/Cargo.toml
57+
COPY crates/openshell-policy/Cargo.toml crates/openshell-policy/Cargo.toml
58+
COPY crates/openshell-prover/Cargo.toml crates/openshell-prover/Cargo.toml
59+
COPY crates/openshell-tui/Cargo.toml crates/openshell-tui/Cargo.toml
5760
COPY crates/openshell-core/build.rs crates/openshell-core/build.rs
5861
COPY proto/ proto/
5962

6063
# Create dummy source files to build dependencies.
61-
RUN mkdir -p crates/openshell-cli/src crates/openshell-core/src crates/openshell-ocsf/src crates/openshell-providers/src crates/openshell-router/src crates/openshell-sandbox/src crates/openshell-server/src crates/openshell-bootstrap/src && \
64+
RUN mkdir -p crates/openshell-cli/src crates/openshell-core/src crates/openshell-ocsf/src crates/openshell-policy/src crates/openshell-providers/src crates/openshell-prover/src crates/openshell-router/src crates/openshell-sandbox/src crates/openshell-server/src crates/openshell-bootstrap/src crates/openshell-tui/src && \
6265
echo "fn main() {}" > crates/openshell-cli/src/main.rs && \
6366
echo "fn main() {}" > crates/openshell-sandbox/src/main.rs && \
6467
echo "fn main() {}" > crates/openshell-server/src/main.rs && \
6568
touch crates/openshell-core/src/lib.rs && \
6669
touch crates/openshell-ocsf/src/lib.rs && \
6770
touch crates/openshell-providers/src/lib.rs && \
6871
touch crates/openshell-router/src/lib.rs && \
69-
touch crates/openshell-bootstrap/src/lib.rs
72+
touch crates/openshell-bootstrap/src/lib.rs && \
73+
touch crates/openshell-policy/src/lib.rs && \
74+
touch crates/openshell-prover/src/lib.rs && \
75+
touch crates/openshell-tui/src/lib.rs
7076

7177
# Build dependencies only (cached unless Cargo.toml/lock changes).
7278
RUN --mount=type=cache,id=cargo-registry-python-wheels-macos-${TARGETARCH},sharing=locked,target=/root/.cargo/registry \

0 commit comments

Comments
 (0)