Skip to content
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

Jump to bottom

fix: Docker build for compressor #2874

Merged
merged 1 commit into from
Sep 13, 2024
Merged

fix: Docker build for compressor #2874

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
8 changes: 5 additions & 3 deletions infrastructure/zk/src/docker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Command } from 'commander';
import {Command} from 'commander';
import * as utils from 'utils';

const IMAGES = [
Expand Down Expand Up @@ -31,7 +31,7 @@ async function dockerCommand(
dockerOrg: string = 'matterlabs'
) {
// Generating all tags for containers. We need 2 tags here: SHA and SHA+TS
const { stdout: COMMIT_SHORT_SHA }: { stdout: string } = await utils.exec('git rev-parse --short HEAD');
const {stdout: COMMIT_SHORT_SHA}: { stdout: string } = await utils.exec('git rev-parse --short HEAD');
// COMMIT_SHORT_SHA returns with newline, so we need to trim it
const imageTagShaTS: string = process.env.IMAGE_TAG_SUFFIX
? process.env.IMAGE_TAG_SUFFIX
Expand Down Expand Up @@ -114,7 +114,7 @@ async function _build(image: string, tagList: string[], dockerOrg: string, platf
if (platform != '') {
buildArgs += `--platform=${platform} `;
}
if (image === 'prover-gpu-fri') {
if (image === 'prover-gpu-fri' || image == 'proof-fri-gpu-compressor') {
const cudaArch = process.env.CUDA_ARCH;
buildArgs += `--build-arg CUDA_ARCH='${cudaArch}' `;
}
Expand All @@ -126,6 +126,8 @@ async function _build(image: string, tagList: string[], dockerOrg: string, platf
}
buildArgs += extraArgs;

console.log("Build args: ", buildArgs);

Artemka374 marked this conversation as resolved.
Show resolved Hide resolved
const buildCommand =
`DOCKER_BUILDKIT=1 docker buildx build ${tagsToBuild}` +
(buildArgs ? ` ${buildArgs}` : '') +
Expand Down
Loading