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

Rename 'archs' input and improve multiarch

Browse source 
Expand readme
Add example

Signed-off-by: Tim Etchells <tetchel@gmail.com>
This commit is contained in:
Tim Etchells 2021-07-09 10:29:04 -04:00
parent 098556ccc2
commit 5cf7e9c453
12 changed files with 670 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/index.ts
View file

@ -33,21 +33,20 @@ export async function run(): Promise<void> {
const tagsList: string[] = tags.split(" ");
// info message if user doesn't provides any tag
if (!tagsList.length) {
if (tagsList.length === 0) {
core.info(`Input "${Inputs.TAGS}" is not provided, using default tag "${DEFAULT_TAG}"`);
tagsList.push(DEFAULT_TAG);
}
const newImage = `${image}:${tagsList[0]}`;
const useOCI = core.getInput(Inputs.OCI) === "true";
let archs: string | undefined = core.getInput(Inputs.ARCHS);
// remove white spaces (if any) in archs input
archs = archs.replace(/\s+/g, "");
const arch = getArch();
if (dockerFiles.length !== 0) {
await doBuildUsingDockerFiles(cli, newImage, workspace, dockerFiles, useOCI, archs);
await doBuildUsingDockerFiles(cli, newImage, workspace, dockerFiles, useOCI, arch);
}
else {
await doBuildFromScratch(cli, newImage, useOCI, archs);
await doBuildFromScratch(cli, newImage, useOCI, arch);
}
if (tagsList.length > 1) {
@ -58,7 +57,7 @@ export async function run(): Promise<void> {
}
async function doBuildUsingDockerFiles(
cli: BuildahCli, newImage: string, workspace: string, dockerFiles: string[], useOCI: boolean, archs: string
cli: BuildahCli, newImage: string, workspace: string, dockerFiles: string[], useOCI: boolean, arch: string
): Promise<void> {
if (dockerFiles.length === 1) {
core.info(`Performing build from Dockerfile`);
@ -81,12 +80,12 @@ async function doBuildUsingDockerFiles(
buildahBudExtraArgs = lines.flatMap((line) => line.split(" ")).map((arg) => arg.trim());
}
await cli.buildUsingDocker(
newImage, context, dockerFileAbsPaths, buildArgs, useOCI, archs, layers, buildahBudExtraArgs
newImage, context, dockerFileAbsPaths, buildArgs, useOCI, arch, layers, buildahBudExtraArgs
);
}
async function doBuildFromScratch(
cli: BuildahCli, newImage: string, useOCI: boolean, archs: string
cli: BuildahCli, newImage: string, useOCI: boolean, arch: string
): Promise<void> {
core.info(`Performing build from scratch`);
@ -107,7 +106,7 @@ async function doBuildFromScratch(
port,
workingdir: workingDir,
envs,
archs,
arch,
};
await cli.config(containerId, newImageConfig);
await cli.commit(containerId, newImage, useOCI);
@ -127,4 +126,19 @@ function getInputList(name: string): string[] {
);
}
function getArch(): string {
// 'arch' should be used over 'archs', see https://github.com/redhat-actions/buildah-build/issues/60
const archs = core.getInput(Inputs.ARCHS).replace(/\s+/g, "");
const arch = core.getInput(Inputs.ARCH).replace(/\s+/g, "");
if (arch && archs) {
core.warning(
`Please use only one input of "${Inputs.ARCH}" and "${Inputs.ARCHS}". "${Inputs.ARCH}" takes precedence, `
+ `so --arch argument will be "${arch}".`
);
}
return arch || archs;
}
run().catch(core.setFailed);