defunkt/sandlot
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: defunkt:8c1a01ba7763578696003dc1a598158a96b48613
Branches Tags
defunkt:main
defunkt:rust-rewrite
...
compare: defunkt:24ebdf4f5aaea998a8cc6db7c078210731c1c26b
Branches Tags
defunkt:main
defunkt:rust-rewrite

3 Commits
8c1a01ba77 ... 24ebdf4f5a

Author SHA1 Message Date
Chris Wanstrath
24ebdf4f5a Merge branch 'path' 2026-03-15 13:50:56 -07:00
Chris Wanstrath
b2694a3933 Add /sandlot/bin to container PATH 2026-03-15 13:50:50 -07:00
Chris Wanstrath
ec16a6722b Replace make with build-essential in package lists 2026-03-15 12:40:40 -07:00
1 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
src/vm.ts
View File

@ -9,7 +9,7 @@ const DEBUG = !!process.env.DEBUG
const CONTAINER_NAME = "sandlot" const CONTAINER_NAME = "sandlot"
const USER = "ubuntu" const USER = "ubuntu"
const CLAUDE_BIN = `/home/${USER}/.local/bin/claude` const CLAUDE_BIN = `/home/${USER}/.local/bin/claude`
const CONTAINER_PATH = `/sandlot/.cargo/bin:/sandlot/.go/bin:/sandlot/.gopath/bin:/home/${USER}/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin` const CONTAINER_PATH = `/sandlot/bin:/sandlot/.cargo/bin:/sandlot/.go/bin:/sandlot/.gopath/bin:/home/${USER}/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`
const CONTAINER_ENV = { const CONTAINER_ENV = {
RUSTUP_HOME: "/sandlot/.rustup", RUSTUP_HOME: "/sandlot/.rustup",
CARGO_HOME: "/sandlot/.cargo", CARGO_HOME: "/sandlot/.cargo",
@ -80,8 +80,8 @@ async function createContainer(home: string): Promise<void> {
/** Install base system packages (as root). */ /** Install base system packages (as root). */
async function installPackages(cached: boolean): Promise<void> { async function installPackages(cached: boolean): Promise<void> {
const packages = cached const packages = cached
? "curl git fish make" ? "curl git fish build-essential"
: "curl git fish unzip make" : "curl git fish unzip build-essential"
await run( await run(
$`container exec ${CONTAINER_NAME} bash -c ${`apt update && apt install -y ${packages}`}`, $`container exec ${CONTAINER_NAME} bash -c ${`apt update && apt install -y ${packages}`}`,
"Package installation") "Package installation")
@ -370,7 +370,7 @@ export async function neofetch(): Promise<void> {
/** Run a bash command in the container at the given workdir, capturing output. */ /** Run a bash command in the container at the given workdir, capturing output. */
export async function exec(workdir: string, command: string): Promise<{ exitCode: number; stdout: string; stderr: string }> { export async function exec(workdir: string, command: string): Promise<{ exitCode: number; stdout: string; stderr: string }> {
const envExports = Object.entries(CONTAINER_ENV).map(([k, v]) => `export ${k}=${v}`).join("; ") const envExports = Object.entries(CONTAINER_ENV).map(([k, v]) => `export ${k}=${v}`).join("; ")
const result = await $`container exec --user ${USER} --workdir ${containerPath(workdir)} ${CONTAINER_NAME} bash -c ${`export PATH=$HOME/.local/bin:$PATH; ${envExports}; ` + command}`.nothrow().quiet() const result = await $`container exec --user ${USER} --workdir ${containerPath(workdir)} ${CONTAINER_NAME} bash -c ${`export PATH=${CONTAINER_PATH}; ${envExports}; ` + command}`.nothrow().quiet()
return { return {
exitCode: result.exitCode, exitCode: result.exitCode,
stdout: result.stdout.toString().trim(), stdout: result.stdout.toString().trim(),