Skip to content

Commit 243dc1e

Browse files
committed
refactor(image): retire residual community image references
Replace the remaining OpenShell Community sandbox image references (RPM/Helm docs, SDK doc examples, and test fixtures) with the Alpine default, and update the resolve_from test that asserted community-name expansion — bare values are now passed through unchanged as explicit OCI references. The VM runtime image pin (driver-vm/runtime/pins.env) and the GPU e2e build base (tasks/scripts/e2e-gpu-build-images.sh) reference a community image for their own runtime/build needs and are intentionally left for separate follow-ups. Part of #3116. Signed-off-by: Akram <akram.benaissi@gmail.com>
1 parent 362fb75 commit 243dc1e

9 files changed

Lines changed: 20 additions & 21 deletions

File tree

‎crates/openshell-cli/src/run.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6563,7 +6563,7 @@ mod tests {
65636563
}
65646564

65656565
#[test]
6566-
fn resolve_from_keeps_bare_community_name_when_local_directory_matches() {
6566+
fn resolve_from_keeps_bare_name_as_image_when_local_directory_matches() {
65676567
let _lock = TEST_ENV_LOCK
65686568
.lock()
65696569
.unwrap_or_else(std::sync::PoisonError::into_inner);
@@ -6575,11 +6575,10 @@ mod tests {
65756575
let result = resolve_from("python");
65766576

65776577
std::env::set_current_dir(original_dir).expect("restore current directory");
6578-
match result.expect("bare community name should not be a local path") {
6579-
super::ResolvedSource::Image(image) => assert_eq!(
6580-
image,
6581-
"ghcr.io/nvidia/openshell-community/sandboxes/python:latest"
6582-
),
6578+
match result.expect("bare name should be treated as an image, not a local path") {
6579+
// Bare values are passed through unchanged as explicit OCI references
6580+
// (community-name expansion was removed).
6581+
super::ResolvedSource::Image(image) => assert_eq!(image, "python"),
65836582
other @ super::ResolvedSource::RootfsTar { .. } => {
65846583
panic!("expected image source, got {other:?}");
65856584
}

‎crates/openshell-driver-docker/src/tests.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fn test_sandbox() -> DriverSandbox {
6262
log_level: "debug".to_string(),
6363
environment: HashMap::from([("SPEC_ENV".to_string(), "spec".to_string())]),
6464
template: Some(DriverSandboxTemplate {
65-
image: "ghcr.io/nvidia/openshell-community/sandboxes/base:latest".to_string(),
65+
image: "docker.io/library/alpine:3.22".to_string(),
6666
agent_socket_path: String::new(),
6767
labels: HashMap::new(),
6868
environment: HashMap::from([("TEMPLATE_ENV".to_string(), "template".to_string())]),

‎crates/openshell-ocsf/tests/roundtrip.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn ctx() -> EventContext {
2222
EventContext {
2323
sandbox_id: "sb-7f3a9c2e14b8".to_string(),
2424
sandbox_name: "agent-workspace-01".to_string(),
25-
container_image: "ghcr.io/nvidia/openshell-community/sandboxes/base:latest".to_string(),
25+
container_image: "docker.io/library/alpine:3.22".to_string(),
2626
hostname: "openshell-sb-7f3a9c2e14b8".to_string(),
2727
product_version: "0.42.1".to_string(),
2828
proxy_ip: IpAddr::V4(Ipv4Addr::LOCALHOST),

‎crates/openshell-sdk/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ client
9292
}),
9393
spec: Some(SandboxWorkloadTemplateSpec {
9494
workload: Some(SandboxWorkloadConfig {
95-
image: "ghcr.io/nvidia/openshell-community/sandboxes/python:latest".to_string(),
95+
image: "docker.io/library/alpine:3.22".to_string(),
9696
..Default::default()
9797
}),
9898
..Default::default()

‎crates/openshell-sdk/src/types.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl From<i32> for SandboxPhase {
100100
pub struct SandboxSpec {
101101
/// Optional user-supplied sandbox name. When empty the server generates one.
102102
pub name: Option<String>,
103-
/// Container image reference (e.g. `ghcr.io/nvidia/openshell-community/sandboxes/python:latest`).
103+
/// Container image reference (e.g. `docker.io/library/alpine:3.22`).
104104
pub image: Option<String>,
105105
/// Labels attached to the sandbox.
106106
pub labels: HashMap<String, String>,

‎crates/openshell-server/src/compute/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11585,7 +11585,7 @@ mod tests {
1158511585
..Default::default()
1158611586
}),
1158711587
template: Some(SandboxTemplate {
11588-
image: "ghcr.io/nvidia/openshell-community/sandboxes/base:latest".to_string(),
11588+
image: "docker.io/library/alpine:3.22".to_string(),
1158911589
driver_config: Some(prost_types::Struct {
1159011590
fields: [
1159111591
(

‎deploy/helm/openshell/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ discovery endpoint or its TLS CA.
288288
| server.policyValidationFailureMode | string | `"fail_closed"` | Posture when a candidate sandbox policy fails validation. `fail_closed` deactivates the previous policy; `retain_last_valid` keeps it active. |
289289
| server.providerTokenGrants.spiffe.enabled | bool | `false` | Mount the SPIFFE Workload API socket into gateway and sandbox pods for dynamic provider token grants. |
290290
| server.providerTokenGrants.spiffe.workloadApiSocketPath | string | `"/spiffe-workload-api/spire-agent.sock"` | Path to the SPIFFE Workload API socket mounted into gateway and sandbox pods. |
291-
| server.sandboxImage | string | `"ghcr.io/nvidia/openshell-community/sandboxes/base:latest"` | Default sandbox image used when requests do not specify one. |
291+
| server.sandboxImage | string | `"docker.io/library/alpine:3.22"` | Default sandbox image used when requests do not specify one. |
292292
| server.sandboxImagePullPolicy | string | `nil` | Pull policy for sandbox pods. Leave unset to use the Kubernetes image default (Always for :latest, IfNotPresent otherwise). Prefer always, if_not_present, or never; the chart also accepts legacy Kubernetes spellings Always, IfNotPresent, and Never. |
293293
| server.sandboxImagePullSecrets | list | `[]` | Image pull secrets attached to sandbox pods. Referenced Secrets must exist in the sandbox namespace. |
294294
| server.sandboxJwt.gatewayId | string | `""` | Stable gateway identity embedded in iss/aud of every minted token. Defaults to the release name so HA replicas share identity. |

‎deploy/rpm/CONFIGURATION.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ overrides that persist across package upgrades.
221221
|-------------|---------|-------------|
222222
| `bind_address` | `127.0.0.1:17670` (gateway default) | Address for the primary gRPC/HTTP API listener. |
223223
| `compute_driver` | `"podman"` (RPM default) | When unset, the gateway auto-detects Kubernetes, then Podman, then Docker. The RPM default pins to Podman; legacy `compute_drivers` lists are rejected. |
224-
| `[openshell.drivers.podman].default_image` | `ghcr.io/nvidia/openshell-community/sandboxes/base:latest` | Default sandbox image. |
224+
| `[openshell.drivers.podman].default_image` | `docker.io/library/alpine:3.22` | Default sandbox image. |
225225
| `[openshell.drivers.podman].sandbox_runtime_image` | `ghcr.io/nvidia/openshell/sandbox:latest` | Static musl sandbox runtime image mounted into Podman workloads. |
226226
| `[openshell.drivers.podman].supervisor_image` | `ghcr.io/nvidia/openshell/supervisor:latest` | Dynamic glibc supervisor image used outside the workload. |
227227
| `[openshell.gateway].guest_tls_ca`, `guest_tls_cert`, `guest_tls_key` | auto-generated paths | Gateway-owned client TLS material injected into the selected local driver and mounted into sandbox containers. |
@@ -244,7 +244,7 @@ version = 2
244244
compute_driver = "podman"
245245

246246
[openshell.drivers.podman]
247-
default_image = "ghcr.io/nvidia/openshell-community/sandboxes/base:latest"
247+
default_image = "docker.io/library/alpine:3.22"
248248
image_pull_policy = "if_not_present"
249249
health_check_interval_secs = 10
250250
network_name = "openshell"
@@ -261,7 +261,7 @@ To update cached images:
261261

262262
```shell
263263
podman pull ghcr.io/nvidia/openshell/supervisor:latest
264-
podman pull ghcr.io/nvidia/openshell-community/sandboxes/base:latest
264+
podman pull docker.io/library/alpine:3.22
265265
```
266266

267267
Or set `image_pull_policy = "always"` in
@@ -273,7 +273,7 @@ To pin specific image versions instead of `:latest`, set these values in
273273
```toml
274274
sandbox_runtime_image = "ghcr.io/nvidia/openshell/sandbox:v0.0.37"
275275
supervisor_image = "ghcr.io/nvidia/openshell/supervisor:v0.0.37"
276-
default_image = "ghcr.io/nvidia/openshell-community/sandboxes/base:v0.0.37"
276+
default_image = "docker.io/library/alpine:3.22"
277277
```
278278

279279
For air-gapped environments:
@@ -282,9 +282,9 @@ For air-gapped environments:
282282

283283
```shell
284284
podman pull ghcr.io/nvidia/openshell/supervisor:latest
285-
podman pull ghcr.io/nvidia/openshell-community/sandboxes/base:latest
285+
podman pull docker.io/library/alpine:3.22
286286
podman save -o supervisor.tar ghcr.io/nvidia/openshell/supervisor:latest
287-
podman save -o sandbox.tar ghcr.io/nvidia/openshell-community/sandboxes/base:latest
287+
podman save -o sandbox.tar docker.io/library/alpine:3.22
288288
```
289289

290290
1. Transfer the tarballs to the air-gapped host and load them:

‎deploy/rpm/TROUBLESHOOTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ sudo usermod --add-subuids 100000-165535 --add-subgids 100000-165535 $USER
176176
**Image pull failure.** Verify ghcr.io is reachable:
177177

178178
```shell
179-
podman pull ghcr.io/nvidia/openshell-community/sandboxes/base:latest
179+
podman pull docker.io/library/alpine:3.22
180180
```
181181

182182
### Images not updating
@@ -185,7 +185,7 @@ The default image pull policy is `if_not_present` -- images are pulled once
185185
and cached. To update:
186186

187187
```shell
188-
podman pull ghcr.io/nvidia/openshell-community/sandboxes/base:latest
188+
podman pull docker.io/library/alpine:3.22
189189
podman pull ghcr.io/nvidia/openshell/supervisor:latest
190190
```
191191

@@ -239,7 +239,7 @@ To pick up new container images after an upgrade:
239239

240240
```shell
241241
podman pull ghcr.io/nvidia/openshell/supervisor:latest
242-
podman pull ghcr.io/nvidia/openshell-community/sandboxes/base:latest
242+
podman pull docker.io/library/alpine:3.22
243243
```
244244

245245
### Migrating a TLS-enabled local driver to schema version 2

0 commit comments

Comments
 (0)