mirror of
https://github.com/docker/build-push-action.git
synced 2025-08-10 02:22:11 +00:00
src: use BLACKSMITH prefixed VM ID env var
This commit is contained in:
parent
574eb0ee0b
commit
a037e6f634
2
dist/index.js
generated
vendored
2
dist/index.js
generated
vendored
File diff suppressed because one or more lines are too long
2
dist/index.js.map
generated
vendored
2
dist/index.js.map
generated
vendored
File diff suppressed because one or more lines are too long
@ -49,7 +49,7 @@ export async function reportBuildPushActionFailure(error?: Error, event?: string
|
|||||||
repo_name: process.env.GITHUB_REPO_NAME || '',
|
repo_name: process.env.GITHUB_REPO_NAME || '',
|
||||||
region: process.env.BLACKSMITH_REGION || 'eu-central',
|
region: process.env.BLACKSMITH_REGION || 'eu-central',
|
||||||
arch: process.env.BLACKSMITH_ENV?.includes('arm') ? 'arm64' : 'amd64',
|
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 || '',
|
petname: process.env.PETNAME || '',
|
||||||
message: event ? `${event}: ${error?.message || ''}` : error?.message || '',
|
message: event ? `${event}: ${error?.message || ''}` : error?.message || '',
|
||||||
warning: isWarning || false
|
warning: isWarning || false
|
||||||
@ -72,7 +72,7 @@ export async function reportBuildCompleted(exportRes?: ExportRecordResponse, bla
|
|||||||
await agentClient.commitStickyDisk({
|
await agentClient.commitStickyDisk({
|
||||||
exposeId: exposeId || '',
|
exposeId: exposeId || '',
|
||||||
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
|
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
|
||||||
vmId: process.env.VM_ID || '',
|
vmId: process.env.BLACKSMITH_VM_ID || '',
|
||||||
shouldCommit: true,
|
shouldCommit: true,
|
||||||
repoName: process.env.GITHUB_REPO_NAME || '',
|
repoName: process.env.GITHUB_REPO_NAME || '',
|
||||||
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
||||||
@ -122,7 +122,7 @@ export async function reportBuildFailed(dockerBuildId: string | null, dockerBuil
|
|||||||
await blacksmithAgentClient.commitStickyDisk({
|
await blacksmithAgentClient.commitStickyDisk({
|
||||||
exposeId: exposeId || '',
|
exposeId: exposeId || '',
|
||||||
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
|
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
|
||||||
vmId: process.env.VM_ID || '',
|
vmId: process.env.BLACKSMITH_VM_ID || '',
|
||||||
shouldCommit: false,
|
shouldCommit: false,
|
||||||
repoName: process.env.GITHUB_REPO_NAME || '',
|
repoName: process.env.GITHUB_REPO_NAME || '',
|
||||||
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
||||||
@ -152,7 +152,7 @@ export async function reportBuild(dockerfilePath: string) {
|
|||||||
region: process.env.BLACKSMITH_REGION || 'eu-central',
|
region: process.env.BLACKSMITH_REGION || 'eu-central',
|
||||||
arch: process.env.BLACKSMITH_ENV?.includes('arm') ? 'arm64' : 'amd64',
|
arch: process.env.BLACKSMITH_ENV?.includes('arm') ? 'arm64' : 'amd64',
|
||||||
git_sha: process.env.GITHUB_SHA || '',
|
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 || ''
|
git_branch: process.env.GITHUB_REF_NAME || ''
|
||||||
};
|
};
|
||||||
core.debug(`Reporting build with options: ${JSON.stringify(requestBody, null, 2)}`);
|
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({
|
await agentClient.commitStickyDisk({
|
||||||
exposeId: exposeId || '',
|
exposeId: exposeId || '',
|
||||||
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
|
stickyDiskKey: process.env.GITHUB_REPO_NAME || '',
|
||||||
vmId: process.env.VM_ID || '',
|
vmId: process.env.BLACKSMITH_VM_ID || '',
|
||||||
shouldCommit,
|
shouldCommit,
|
||||||
repoName: process.env.GITHUB_REPO_NAME || '',
|
repoName: process.env.GITHUB_REPO_NAME || '',
|
||||||
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
||||||
|
@ -187,7 +187,7 @@ export async function getStickyDisk(options?: {signal?: AbortSignal}): Promise<{
|
|||||||
stickyDiskKey: stickyDiskKey,
|
stickyDiskKey: stickyDiskKey,
|
||||||
region: process.env.BLACKSMITH_REGION || 'eu-central',
|
region: process.env.BLACKSMITH_REGION || 'eu-central',
|
||||||
installationModelId: process.env.BLACKSMITH_INSTALLATION_MODEL_ID || '',
|
installationModelId: process.env.BLACKSMITH_INSTALLATION_MODEL_ID || '',
|
||||||
vmId: process.env.VM_ID || '',
|
vmId: process.env.BLACKSMITH_VM_ID || '',
|
||||||
stickyDiskType: 'dockerfile',
|
stickyDiskType: 'dockerfile',
|
||||||
repoName: process.env.GITHUB_REPO_NAME || '',
|
repoName: process.env.GITHUB_REPO_NAME || '',
|
||||||
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
stickyDiskToken: process.env.BLACKSMITH_STICKYDISK_TOKEN || ''
|
||||||
@ -210,7 +210,7 @@ export async function joinTailnet(): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
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');
|
core.info('Successfully joined tailnet');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user