Skip to content

Commit 86c787e

Browse files
committed
No longer build or use the modify-cargo-toml tool
1 parent 8322582 commit 86c787e

File tree

4 files changed

+6
-65
lines changed

4 files changed

+6
-65
lines changed

compiler/base/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,6 @@ COPY --chown=playground Cargo.toml /playground/Cargo.toml
6868
COPY --chown=playground crate-information.json /playground/crate-information.json
6969
RUN cargo fetch
7070

71-
# Build our tool for modifying Cargo.toml at runtime
72-
73-
FROM toolchain as modify-cargo-toml
74-
75-
COPY --chown=playground modify-cargo-toml /playground/modify-cargo-toml
76-
RUN cargo build --release --manifest-path=/playground/modify-cargo-toml/Cargo.toml
77-
7871
# Set up cargo-chef for faster builds
7972

8073
FROM toolchain as chef-available
@@ -116,7 +109,6 @@ RUN cargo clippy
116109
RUN if [ "${channel}" = 'nightly' ]; then cargo miri setup; cargo miri run; fi
117110
RUN rm src/*.rs
118111

119-
COPY --from=modify-cargo-toml /playground/modify-cargo-toml/target/release/modify-cargo-toml /playground/.cargo/bin
120112
COPY --from=build-orchestrator /playground/.cargo/bin/worker /playground/.cargo/bin/worker
121113
COPY --from=wasm-tools /playground/.cargo/bin/wasm-tools /playground/.cargo/bin
122114
COPY --chown=playground cargo-wasm /playground/.cargo/bin

compiler/base/entrypoint.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22

33
set -eu
44

5-
if [[ -z "${PLAYGROUND_ORCHESTRATOR:-}" ]]; then
6-
timeout=${PLAYGROUND_TIMEOUT:-10}
7-
8-
modify-cargo-toml
9-
10-
# Don't use `exec` here. The shell is what prints out the useful
11-
# "Killed" message
12-
timeout --signal=KILL ${timeout} "$@"
13-
else
14-
exec "$@"
15-
fi
5+
# This entrypoint is a no-op but I'm leaving it to be easier to
6+
# re-create at some future point.
7+
exec "$@"

compiler/base/modify-cargo-toml/src/main.rs

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

compiler/base/orchestrator/src/coordinator.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2617,6 +2617,9 @@ impl Backend for DockerBackend {
26172617
.args(["--name", &name])
26182618
.arg("-i")
26192619
.args(["-a", "stdin", "-a", "stdout", "-a", "stderr"])
2620+
// PLAYGROUND_ORCHESTRATOR is vestigial; I'm leaving it
2621+
// for a bit to allow new containers to get built and
2622+
// distributed.
26202623
.args(["-e", "PLAYGROUND_ORCHESTRATOR=1"])
26212624
.arg("--rm")
26222625
.arg(channel.to_container_name())

0 commit comments

Comments
 (0)