Skip to content

fix artifact file ownership inside container builds #1846

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

Open
FredrikHson wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

fix artifact file ownership inside container builds #1846

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
10 changes: 5 additions & 5 deletions src/job.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,12 +694,12 @@ If you know what you're doing and would like to suppress this warning, use one o
const time = process.hrtime();
this.refreshLongRunningSilentTimeout(writeStreams);

let chownOpt = "0:0";
let this.chownOpt = "0:0";
let chmodOpt = "a+rw";
if (!this.argv.umask) {
const {stdout} = await Utils.spawn([this.argv.containerExecutable, "run", "--rm", "--entrypoint", "sh", imageName, "-c", "echo \"$(id -u):$(id -g)\""]);
chownOpt = stdout;
if (chownOpt == "0:0") {
this.chownOpt = stdout;
if (this.chownOpt == "0:0") {
chmodOpt = "g-w";
}
}
Expand All @@ -720,7 +720,7 @@ If you know what you're doing and would like to suppress this warning, use one o
}
}

helperContainerArgs.push(`${helperImageName}`, "sh", "-c", `chown ${chownOpt} -R ${this.ciProjectDir} && chmod ${chmodOpt} -R ${this.ciProjectDir} && chown ${chownOpt} -R /tmp/ && chmod ${chmodOpt} -R /tmp/`);
helperContainerArgs.push(`${helperImageName}`, "sh", "-c", `chown ${this.chownOpt} -R ${this.ciProjectDir} && chmod ${chmodOpt} -R ${this.ciProjectDir} && chown ${this.chownOpt} -R /tmp/ && chmod ${chmodOpt} -R /tmp/`);

const {stdout: containerId} = await Utils.spawn(helperContainerArgs, argv.cwd);
this._containersToClean.push(containerId);
Expand Down Expand Up @@ -1336,7 +1336,7 @@ If you know what you're doing and would like to suppress this warning, use one o
if (!this.imageName(this._variables) && this.argv.shellIsolation) {
return Utils.spawn(["rsync", "-a", `${source}/.`, `${this.argv.cwd}/${this.argv.stateDir}/builds/${safeJobName}`]);
}
return Utils.spawn([this.argv.containerExecutable, "cp", `${source}/.`, `${this._containerId}:${this.ciProjectDir}`]);
return Utils.spawn(["sh","-c" , `cd ${source}; tar -cf - . --owner ${this.chownOpt.split(":")[0]} --group ${this.chownOpt.split(":")[1]} | ${this.argv.containerExecutable} cp - ${this._containerId}:${this.ciProjectDir}`]);

@firecow firecow May 9, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please attach some performance charts. I'm worried this would kill performance in big projects.

}

private async copyCacheOut (writeStreams: WriteStreams, expanded: {[key: string]: string}) {
Expand Down
Loading