Skip to content

Commit 5b64c91

Browse files
committed
Auto merge of #2736 - RalfJung:josh, r=oli-obk
update josh instructions Fixes rust-lang/miri#2730 r\? `@oli-obk`
2 parents e82a604 + 90d8fc6 commit 5b64c91

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/tools/miri/CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,16 +232,16 @@ You can also directly run Miri on a Rust source file:
232232

233233
## Advanced topic: Syncing with the rustc repo
234234

235-
We use the [`josh` proxy](https://github.com/josh-project/josh) to transmit
236-
changes between the rustc and Miri repositories. For now, the latest git version
237-
of josh needs to be built from source. This downloads and runs josh:
235+
We use the [`josh` proxy](https://github.com/josh-project/josh) to transmit changes between the
236+
rustc and Miri repositories. The eaisest way to run josh is via docker:
238237

239238
```sh
240-
git clone https://github.com/josh-project/josh
241-
cd josh
242-
cargo run --release -p josh-proxy -- --local=local --remote=https://github.com --no-background
239+
docker pull joshproject/josh-proxy:latest
240+
docker run -it -p 8000:8000 -e JOSH_REMOTE=https://github.com -e JOSH_EXTRA_OPTS=--no-background -v josh-vol:/data/git joshproject/josh-proxy:latest
243241
```
244242

243+
This sets up a local volume `josh-vol` for josh's cache.
244+
245245
### Importing changes from the rustc repo
246246

247247
Josh needs to be running, as described above.

0 commit comments

Comments
 (0)