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

Add draft implementation of 'platform' argument support

Browse source
This commit is contained in:
James Addison 2021-10-05 23:38:03 +01:00
parent f123b1f960
commit 0c97e9954d
4 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/index.ts
View file

@ -9,7 +9,7 @@ import * as path from "path";
import { Inputs, Outputs } from "./generated/inputs-outputs";
import { BuildahCli, BuildahConfigSettings } from "./buildah";
import {
getArch, getContainerfiles, getInputList, splitByNewline,
getArch, getPlatform, getContainerfiles, getInputList, splitByNewline,
} from "./utils";
export async function run(): Promise<void> {
@ -43,12 +43,13 @@ export async function run(): Promise<void> {
const useOCI = core.getInput(Inputs.OCI) === "true";
const arch = getArch();
const platform = getPlatform();
if (containerFiles.length !== 0) {
await doBuildUsingContainerFiles(cli, newImage, workspace, containerFiles, useOCI, arch);
await doBuildUsingContainerFiles(cli, newImage, workspace, containerFiles, useOCI, arch, platform);
}
else {
await doBuildFromScratch(cli, newImage, useOCI, arch);
await doBuildFromScratch(cli, newImage, useOCI, arch, platform);
}
if (tagsList.length > 1) {
@ -60,7 +61,8 @@ export async function run(): Promise<void> {
}
async function doBuildUsingContainerFiles(
cli: BuildahCli, newImage: string, workspace: string, containerFiles: string[], useOCI: boolean, arch: string
cli: BuildahCli, newImage: string, workspace: string, containerFiles: string[], useOCI: boolean, arch: string,
platform: string
): Promise<void> {
if (containerFiles.length === 1) {
core.info(`Performing build from Containerfile`);
@ -83,12 +85,12 @@ async function doBuildUsingContainerFiles(
buildahBudExtraArgs = lines.flatMap((line) => line.split(" ")).map((arg) => arg.trim());
}
await cli.buildUsingDocker(
newImage, context, containerFileAbsPaths, buildArgs, useOCI, arch, layers, buildahBudExtraArgs
newImage, context, containerFileAbsPaths, buildArgs, useOCI, arch, platform, layers, buildahBudExtraArgs
);
}
async function doBuildFromScratch(
cli: BuildahCli, newImage: string, useOCI: boolean, arch: string
cli: BuildahCli, newImage: string, useOCI: boolean, arch: string, platform: string
): Promise<void> {
core.info(`Performing build from scratch`);
@ -108,6 +110,7 @@ async function doBuildFromScratch(
workingdir: workingDir,
envs,
arch,
platform,
};
await cli.config(containerId, newImageConfig);
await cli.copy(containerId, content);