Skip to content

fix: take image refs out of meta-images attributes #329

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

Open
locker95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: take image refs out of meta-images attributes #329

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
41 changes: 39 additions & 2 deletions .github/workflows/bake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,37 @@ jobs:
};
const renderTemplate = value => Util.compileHandlebars(value, {noEscape: true}, {meta});

// metadata-action lines are either "org/app" or "name=org/app,enable=...".
// buildx name= wants the ref only, and enable=false should not be a destination.
const metaImageName = entry => {
const line = entry.trim();
if (!line) {
return '';
}
let name = '';
let enable = 'true';
for (const part of line.split(',')) {
const eq = part.indexOf('=');
if (eq === -1) {
if (!name) {
name = part.trim();
}
continue;
}
const key = part.slice(0, eq).trim();
const value = part.slice(eq + 1).trim();
if (key === 'name') {
name = value;
} else if (key === 'enable') {
enable = value;
}
}
if (!name || enable === 'false') {
return '';
}
return name;
};

const gitContextAttrs = GitHub.context.ref.startsWith('refs/tags/') ? {checksum: GitHub.context.sha} : {'fetch-by-commit': 'true'};
const bakeSource = await new Build().gitContext({subdir: inpContext, attrs: gitContextAttrs});
await core.group(`Set source output`, async () => {
Expand Down Expand Up @@ -946,13 +977,19 @@ jobs:

let outputOverride = '';
switch (inpOutput) {
case 'image':
case 'image': {
if (inpMetaImages.length == 0) {
core.setFailed('meta-images is required when output is image');
return;
}
outputOverride = `*.output=type=image,"name=${inpMetaImages.join(',')}",oci-artifact=true,push-by-digest=true,name-canonical=true,push=${inpPush}`;
const imageNames = inpMetaImages.map(metaImageName).filter(Boolean);
if (imageNames.length === 0) {
core.setFailed('meta-images did not contain an enabled image');
return;
}
outputOverride = `*.output=type=image,"name=${imageNames.join(',')}",oci-artifact=true,push-by-digest=true,name-canonical=true,push=${inpPush}`;
break;
}
case 'local':
outputOverride = `*.output=type=local,platform-split=true,dest=${inpLocalExportDir}`;
break;
Expand Down
41 changes: 39 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,19 +817,56 @@ jobs:
tags: inpMetaTags
};
const renderTemplate = value => Util.compileHandlebars(value, {noEscape: true}, {meta});

// metadata-action lines are either "org/app" or "name=org/app,enable=...".
// buildx name= wants the ref only, and enable=false should not be a destination.
const metaImageName = entry => {
const line = entry.trim();
if (!line) {
return '';
}
let name = '';
let enable = 'true';
for (const part of line.split(',')) {
const eq = part.indexOf('=');
if (eq === -1) {
if (!name) {
name = part.trim();
}
continue;
}
const key = part.slice(0, eq).trim();
const value = part.slice(eq + 1).trim();
if (key === 'name') {
name = value;
} else if (key === 'enable') {
enable = value;
}
}
if (!name || enable === 'false') {
return '';
}
return name;
};

const gitContextAttrs = GitHub.context.ref.startsWith('refs/tags/') ? {checksum: GitHub.context.sha} : {'fetch-by-commit': 'true'};
const buildContext = await new Build().gitContext({subdir: inpContext, attrs: gitContextAttrs});
core.setOutput('context', buildContext);

switch (inpOutput) {
case 'image':
case 'image': {
if (inpMetaImages.length == 0) {
core.setFailed('meta-images is required when output is image');
return;
}
core.setOutput('output', `type=image,"name=${inpMetaImages.join(',')}",oci-artifact=true,push-by-digest=true,name-canonical=true,push=${inpPush}`);
const imageNames = inpMetaImages.map(metaImageName).filter(Boolean);
if (imageNames.length === 0) {
core.setFailed('meta-images did not contain an enabled image');
return;
}
core.setOutput('output', `type=image,"name=${imageNames.join(',')}",oci-artifact=true,push-by-digest=true,name-canonical=true,push=${inpPush}`);
break;
}
case 'local':
core.setOutput('output', `type=local,platform-split=true,dest=${inpLocalExportDir}`);
break;
Expand Down
Loading