Merge branch 'main' into feature/cleanup-shims

This commit is contained in:
Reinier Criel 2025-12-12 08:03:12 -08:00
commit 7e88490bd1
5 changed files with 46 additions and 17 deletions

View file

@ -33,12 +33,16 @@ export class DockerTestContainer {
].join(" ");
execSync(
`docker build -t ${imageName} -f ${dockerFile} ${contextPath} ${buildArgs}`,
`docker build --progress=plain -t ${imageName} -f ${dockerFile} ${contextPath} ${buildArgs}`,
{
stdio: "ignore",
stdio: "pipe",
maxBuffer: 10 * 1024 * 1024, // Default is 1MB, increase to 10MB to account for large build logs
}
);
} catch (error) {
// Only print the build logs if the build fails
if (error.stdout) console.log(error.stdout.toString());
if (error.stderr) console.error(error.stderr.toString());
throw new Error(`Failed to build Docker image: ${error.message}`);
}
}

View file

@ -41,7 +41,7 @@ RUN apt-get install -y fish && \
touch /root/.config/fish/config.fish
# Install Volta and Node.js
RUN curl https://get.volta.sh | bash
RUN curl -fsSL https://get.volta.sh | bash
RUN volta install node@${NODE_VERSION}
RUN volta install npm@${NPM_VERSION}
RUN volta install yarn@${YARN_VERSION}