Skip to content

Commit 02fe98e

Browse files
committed
use crates-build-env from ghcr
1 parent 1b5f174 commit 02fe98e

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- New method `Toolchain::rustup_binary` to allow running arbitrary binaries managed by rustup. Before, only `rustc` and `cargo` could be run.
1111

12+
### Changed
13+
14+
- The default sandbox image is now fetched from [GitHub Container Registry][ghcr-linux].
15+
16+
[ghcr-linux]: https://github.com/orgs/rust-lang/packages/container/package/crates-build-env/linux
17+
1218
## [0.12.0] - 2021-01-28
1319

1420
### Added
1521

1622
- New variant `PrepareError::MissingDependencies`, returned during the prepare
1723
step when a dependency does not exist.
24+
1825
### Changed
1926

2027
- Path dependencies are no longer removed from `Cargo.toml` during the prepare

src/workspace.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use std::time::Duration;
1212
static DEFAULT_SANDBOX_IMAGE: &str = "rustops/crates-build-env-windows";
1313

1414
#[cfg(not(windows))]
15-
static DEFAULT_SANDBOX_IMAGE: &str = "rustops/crates-build-env";
15+
static DEFAULT_SANDBOX_IMAGE: &str = "ghcr.io/rust-lang/crates-build-env/linux";
1616

1717
const DEFAULT_COMMAND_TIMEOUT: Option<Duration> = Some(Duration::from_secs(15 * 60));
1818
const DEFAULT_COMMAND_NO_OUTPUT_TIMEOUT: Option<Duration> = None;
@@ -53,11 +53,11 @@ impl WorkspaceBuilder {
5353

5454
/// Override the image used for sandboxes.
5555
///
56-
/// By default rustwide will use the [rustops/crates-build-env] image on Linux systems, and
57-
/// [rustops/crates-build-env-windows] on Windows systems. Those images contain dependencies to
58-
/// build a large amount of crates.
56+
/// By default rustwide will use the [ghcr.io/rust-lang/crates-build-env/linux-micro] image on
57+
/// Linux systems, and [rustops/crates-build-env-windows] on Windows systems. Those images
58+
/// contain dependencies to build a large amount of crates.
5959
///
60-
/// [rustops/crates-build-env]: https://hub.docker.com/r/rustops/crates-build-env
60+
/// [ghcr.io/rust-lang/crates-build-env/linux-micro]: https://github.com/orgs/rust-lang/packages/container/package/crates-build-env/linux-micro
6161
/// [rustops/crates-build-env-windows]: https://hub.docker.com/r/rustops/crates-build-env-windows
6262
pub fn sandbox_image(mut self, image: SandboxImage) -> Self {
6363
self.sandbox_image = Some(image);

0 commit comments

Comments
 (0)