diff --git a/README.md b/README.md index 37d9406..6f043ab 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ One-time setup: under **Settings → Pages**, set the source to **GitHub Actions | `workspace-cleaner` | **Removed** | The engine store lives in the sandbox. `sbx rm` deletes every container, volume, network and image the lab created. | | `host-port-republisher` | **Removed** | Its job was bridging "container publishes a port" to "localhost on the host". Ports are now published by the runtime (`port@1`, `sbx ports`). | | `configurator` | **Replaced by two small scripts** | `labspace-init.sh` (once: keypair, dirs) and `labspace-stage.sh` (every boot: copy `labspace/` to the instructions dir, write metadata). No git clone, no tarball, no volumes: the content is the workspace, or a content kit. | -| `interface` | **Kept, unchanged** | Reused from the published `dockersamples/labspace-interface` image, copied into the overlay at build time. The built-in `shell` kit (Debian 13) has no Node, so the overlay also carries the `node` binary from `node:24-bookworm-slim`. | +| `interface` | **Kept, unchanged** | Reused from the published `dockersamples/labspace-interface` image (pinned to labspace-infra v0.32.0 by digest in `labspace.dockerfile`), copied into the overlay at build time. The built-in `shell` kit (Debian 13) has no Node, so the overlay also carries the `node` binary from `node:24-bookworm-slim`. | | `workspace` (code-server) | **Kept, built into the overlay** | Same approach as the `code-server` kit in sbx-kits-contrib: pinned install at build time, no download at create. | | `support-vscode-extension` | **Kept, unchanged** | Reused from `dockersamples/labspace-support-vscode-extension`. The JWT + unix socket between interface and IDE still works, now between two processes in one sandbox. | | `marlin-mock` (development stack only) | **Removed** | Analytics are off (`analytics_enabled: false`). | @@ -300,6 +300,5 @@ The kit declares `network-policy@1` (Docker Hub for image pulls, Open VSX for ex - **A set is a pinned artifact.** Bumping the Labspace kit means republishing every lab set that includes it. Keeping the content kit separate (and composing with `--kit`) avoids that, at the cost of two references. - **Kit content is not on the host.** With a content kit, the learner's project lives in the sandbox (`~/project`), so it is gone after `sbx rm`. Mount a host folder if it must be kept. - **The first run still mounts the current directory** as the workspace (the default for `sbx run`). Run from a dedicated, empty folder when using a content kit, never from your home directory: whatever folder you start in is exposed to the sandbox. -- **Pin by digest** the `dockersamples/labspace-interface` and `labspace-support-vscode-extension` base images in `labspace.dockerfile`. - **Init scripts.** labspace-infra ran `/init-scripts/*` in the configurator. The equivalent here would be running an optional `/labspace/init.sh` in the install hook. - The `ttyd` workspace mode in the interface (`WORKSPACE_TYPE=ttyd`) shows the interface already supports a non-VS-Code terminal backend; not used here. diff --git a/kit/labspace.dockerfile b/kit/labspace.dockerfile index 7cc1a79..2055f8c 100644 --- a/kit/labspace.dockerfile +++ b/kit/labspace.dockerfile @@ -10,9 +10,12 @@ # python, go; NO Node), pinned here by the digest this was developed against. ARG BASE_IMAGE=docker.io/sbx/shell@sha256:89ed5d63def6bfb2373d408e3ab6ad55aa5c010f884a182a78299fcf85ea42d1 -# Published by labspace-infra (docker-bake.hcl). TODO: pin both by digest. -ARG INTERFACE_IMAGE=dockersamples/labspace-interface:latest -ARG EXTENSION_IMAGE=dockersamples/labspace-support-vscode-extension:latest +# Published by labspace-infra (docker-bake.hcl), pinned to a release by tag and +# index digest so a kit version always carries the same interface. To move to +# a new labspace-infra release, update both lines together: +# docker buildx imagetools inspect dockersamples/labspace-interface: --format '{{.Manifest.Digest}}' +ARG INTERFACE_IMAGE=dockersamples/labspace-interface:v0.32.0@sha256:7d9848ad2da9bb8bc51b279a4439bf8ba21bc8ddfb99175ac5b9d65264db8227 +ARG EXTENSION_IMAGE=dockersamples/labspace-support-vscode-extension:v0.32.0@sha256:a6685edeb1de044d92a8def430295c05e5aac821fefb882db0105717932e1333 # The workload has no Node, so the overlay carries one. Checked to run on the # Debian 13 base (glibc is forward compatible). ARG NODE_IMAGE=node:24-bookworm-slim