Skip to content

fix: escape $d as $$d in sysroot-stage compose command #5730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lpcox merged 1 commit into from
Jun 30, 2026
Merged

fix: escape $d as $$d in sysroot-stage compose command #5730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/services/sysroot-service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,17 @@ describe('buildSysrootStageService', () => {
expect(service.command[0]).toContain('.awf-sysroot-ready');
});

it('escapes $d as $$d for Docker Compose variable interpolation', () => {
const service = buildSysrootStageService({
config: makeConfig({ runnerTopology: 'arc-dind' }),
registry: 'ghcr.io/github/gh-aw-firewall',
imageTag: 'latest',
});
// Docker Compose treats $var as variable interpolation; $$ escapes to literal $
expect(service.command[0]).toContain('/$$d');
expect(service.command[0]).not.toMatch(/\/\$d[^$]/);
});

it('uses network_mode none (no network needed for copy)', () => {
const service = buildSysrootStageService({
config: makeConfig({ runnerTopology: 'arc-dind' }),
Expand Down
4 changes: 3 additions & 1 deletion src/services/sysroot-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ export function buildSysrootStageService(params: SysrootServiceParams): any {
'fi; ' +
'echo "Copying sysroot filesystem..."; ' +
'for d in usr lib bin sbin etc; do ' +
' [ -d "/$d" ] && cp -a "/$d" /sysroot/; ' +
// Use $$ to escape Docker Compose variable interpolation — Compose
// treats bare $d as a variable reference and replaces it with "".
' [ -d "/$$d" ] && cp -a "/$$d" /sysroot/; ' +
'done; ' +
'if [ -d /lib64 ]; then cp -a /lib64 /sysroot/; fi; ' +
'touch /sysroot/.awf-sysroot-ready; ' +
Expand Down
Loading