Skip to content

Replace kaniko with buildkit #34

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

Merged
biersoeckli merged 1 commit into from
Jul 26, 2025
Merged

Replace kaniko with buildkit #34

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
52 changes: 27 additions & 25 deletions src/server/services/build.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { PathUtils } from "../utils/path.utils";
import registryService, { BUILD_NAMESPACE } from "./registry.service";
import paramService, { ParamService } from "./param.service";

const kanikoImage = "gcr.io/kaniko-project/executor:latest";
const buildkitImage = "moby/buildkit:master";

class BuildService {

Expand Down Expand Up @@ -63,18 +63,26 @@ class BuildService {

const contextPaths = PathUtils.splitPath(app.dockerfilePath);

const kanikoArgs = [
`--dockerfile=${contextPaths.filePath}`,
`--insecure`,
`--log-format=text`,
`--context=${app.gitUrl!.replace("https://", "git://")}#refs/heads/${app.gitBranch}`,
`--destination=${registryService.createInternalContainerRegistryUrlForAppId(app.id)}`
];

if (contextPaths.folderPath) {
kanikoArgs.push(`--context-sub-path=${contextPaths.folderPath}`);
// Prepare Git URL with authentication if needed
let gitContextUrl = `${app.gitUrl!}#refs/heads/${app.gitBranch}${contextPaths.folderPath ? ':' + contextPaths.folderPath : ''}`;
if (app.gitUsername && app.gitToken) {
const authenticatedGitUrl = app.gitUrl!.replace('https://', `https://${app.gitUsername}:${app.gitToken}@`);
gitContextUrl = `${authenticatedGitUrl}#refs/heads/${app.gitBranch}${contextPaths.folderPath ? ':' + contextPaths.folderPath : ''}`;
}

// BuildKit arguments for buildctl-daemonless.sh
const buildkitArgs = [
"build",
"--frontend",
"dockerfile.v0",
"--opt",
`filename=${contextPaths.filePath}`,
"--opt",
`context=${gitContextUrl}`,
"--output",
`type=image,name=${registryService.createInternalContainerRegistryUrlForAppId(app.id)},push=true,registry.insecure=true`
];

dlog(deploymentId, `Dockerfile context path: ${contextPaths.folderPath ?? 'root directory of Git Repository'}. Dockerfile name: ${contextPaths.filePath}`);

const jobDefinition: V1Job = {
Expand All @@ -94,11 +102,17 @@ class BuildService {
ttlSecondsAfterFinished: 86400, // 1 day
template: {
spec: {
// Depends on feature gate UserNamespacesSupport (available in k8s 1.25+)
hostUsers: false,
containers: [
{
name: buildName,
image: kanikoImage,
args: kanikoArgs
image: buildkitImage,
command: ["buildctl-daemonless.sh"],
args: buildkitArgs,
securityContext: {
privileged: true
}
},
],
restartPolicy: "Never",
Expand All @@ -108,18 +122,6 @@ class BuildService {
backoffLimit: 0,
},
};
if (app.gitUsername && app.gitToken) {
jobDefinition.spec!.template.spec!.containers[0].env = [
{
name: "GIT_USERNAME",
value: app.gitUsername
},
{
name: "GIT_PASSWORD",
value: app.gitToken
}
];
}
await k3s.batch.createNamespacedJob(BUILD_NAMESPACE, jobDefinition);

await dlog(deploymentId, `Build job ${buildName} started successfully`);
Expand Down