actions
/
build-push-action
mirror of https://github.com/docker/build-push-action.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: use BLACKSMITH prefixed VM ID env var

pull/1393/head
Claude 2025-06-16 16:12:28 -04:00
parent 574eb0ee0b
commit a037e6f634
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

10
src/reporter.ts
View File

@ -49,7 +49,7 @@ export async function reportBuildPushActionFailure(error?: Error, event?: string
repo_name: process.env.GITHUB_REPO_NAME || '',
region: process.env.BLACKSMITH_REGION || 'eu-central',
arch: process.env.BLACKSMITH_ENV?.includes('arm') ? 'arm64' : 'amd64',
vm_id: process.env.VM_ID || '',
vm_id: process.env.BLACKSMITH_VM_ID || '',
petname: process.env.PETNAME || '',
message: event ? `${event}: ${error?.message || ''}` : error?.message || '',
warning: isWarning || false
@ -72,7 +72,7 @@ export async function reportBuildCompleted(exportRes?: ExportRecordResponse, bla
await agentClient.commitStickyDisk({
exposeId: exposeId || '',
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
vmId: process.env.VM_ID || '',
vmId: process.env.BLACKSMITH_VM_ID || '',
shouldCommit: true,
repoName: process.env.GITHUB_REPO_NAME || '',
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
@ -122,7 +122,7 @@ export async function reportBuildFailed(dockerBuildId: string | null, dockerBuil
await blacksmithAgentClient.commitStickyDisk({
exposeId: exposeId || '',
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
vmId: process.env.VM_ID || '',
vmId: process.env.BLACKSMITH_VM_ID || '',
shouldCommit: false,
repoName: process.env.GITHUB_REPO_NAME || '',
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
@ -152,7 +152,7 @@ export async function reportBuild(dockerfilePath: string) {
region: process.env.BLACKSMITH_REGION || 'eu-central',
arch: process.env.BLACKSMITH_ENV?.includes('arm') ? 'arm64' : 'amd64',
git_sha: process.env.GITHUB_SHA || '',
vm_id: process.env.VM_ID || '',
vm_id: process.env.BLACKSMITH_VM_ID || '',
git_branch: process.env.GITHUB_REF_NAME || ''
};
core.debug(`Reporting build with options: ${JSON.stringify(requestBody, null, 2)}`);
@ -204,7 +204,7 @@ export async function commitStickyDisk(exposeId?: string, shouldCommit: boolean
await agentClient.commitStickyDisk({
exposeId: exposeId || '',
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
vmId: process.env.VM_ID || '',
vmId: process.env.BLACKSMITH_VM_ID || '',
shouldCommit,
repoName: process.env.GITHUB_REPO_NAME || '',
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''

4
src/setup_builder.ts
View File

@ -187,7 +187,7 @@ export async function getStickyDisk(options?: {signal?: AbortSignal}): Promise<{
stickyDiskKey: stickyDiskKey,
region: process.env.BLACKSMITH_REGION || 'eu-central',
installationModelId: process.env.BLACKSMITH_INSTALLATION_MODEL_ID || '',
vmId: process.env.VM_ID || '',
vmId: process.env.BLACKSMITH_VM_ID || '',
stickyDiskType: 'dockerfile',
repoName: process.env.GITHUB_REPO_NAME || '',
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
@ -210,7 +210,7 @@ export async function joinTailnet(): Promise<void> {
}
try {
await execAsync(`sudo tailscale up --authkey=${token} --hostname=${process.env.VM_ID}`);
await execAsync(`sudo tailscale up --authkey=${token} --hostname=${process.env.BLACKSMITH_VM_ID}`);
core.info('Successfully joined tailnet');
} catch (error) {