actions/buildah-build
1
0
Fork 0
mirror of https://github.com/redhat-actions/buildah-build.git synced 2025-06-08 01:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Default to docker image format

Browse source 
Signed-off-by: Tim Etchells <tetchell@redhat.com>
This commit is contained in:
Tim Etchells 2020-11-26 13:00:17 -05:00 • committed by Tim Etchells
parent 3e81bc409d
commit 00654bad07
6 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/buildah.ts
View file

@ -2,11 +2,11 @@ import * as core from "@actions/core";
import * as exec from "@actions/exec";
interface Buildah {
buildUsingDocker(image: string, context: string, dockerFiles: string[], buildArgs: string[]): Promise<CommandResult>;
buildUsingDocker(image: string, context: string, dockerFiles: string[], buildArgs: string[], useOCI: boolean): Promise<CommandResult>;
from(baseImage: string): Promise<CommandResult>;
copy(container: string, contentToCopy: string[]): Promise<CommandResult>;
config(container: string, setting: {}): Promise<CommandResult>;
commit(container: string, newImageName: string, flags?: string[]): Promise<CommandResult>;
commit(container: string, newImageName: string, useOCI: boolean): Promise<CommandResult>;
}
export interface BuildahConfigSettings {
@ -24,7 +24,11 @@ export class BuildahCli implements Buildah {
this.executable = executable;
}
async buildUsingDocker(image: string, context: string, dockerFiles: string[], buildArgs: string[]): Promise<CommandResult> {
private getImageFormatOption(useOCI: boolean): string[] {
return [ '--format', useOCI ? 'oci' : 'docker' ];
}
async buildUsingDocker(image: string, context: string, dockerFiles: string[], buildArgs: string[], useOCI: boolean): Promise<CommandResult> {
const args: string[] = ['bud'];
dockerFiles.forEach(file => {
args.push('-f');
@ -33,7 +37,8 @@ export class BuildahCli implements Buildah {
buildArgs.forEach((buildArg) => {
args.push('--build-arg');
args.push(buildArg);
})
});
args.push(...this.getImageFormatOption(useOCI));
args.push('-t');
args.push(image);
args.push(context);
@ -82,11 +87,11 @@ export class BuildahCli implements Buildah {
return this.execute(args);
}
async commit(container: string, newImageName: string, flags: string[] = []): Promise<CommandResult> {
async commit(container: string, newImageName: string, useOCI: boolean): Promise<CommandResult> {
core.debug('commit');
core.debug(container);
core.debug(newImageName);
const args: string[] = ["commit", ...flags, container, newImageName];
const args: string[] = [ 'commit', ...this.getImageFormatOption(useOCI), '--squash', container, newImageName ];
return this.execute(args);
}