Skip to content

Add unprivshwrap() to run command with none root #167

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

Closed
HuijingHei wants to merge 1 commit into from
Closed

Add unprivshwrap() to run command with none root #167

Show file tree
Hide file tree
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
38 changes: 30 additions & 8 deletions vars/cosaBuild.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@
// overlays: []string -- List of directories to overlay
// skipInit: boolean -- Assume `cosa init` has already been run
// skipKola: boolean -- Do not automatically run kola on resulting build
// user: string -- Build with username (which is used when running pod as root)
def call(params = [:]) {
stage("Build") {
def cosaDir = utils.getCosaDir(params)
def extraFetchArgs = params.get('extraFetchArgs', "");
def extraArgs = params.get('extraArgs', "");

shwrap("mkdir -p ${cosaDir}")
def cmd = "mkdir -p ${cosaDir}"
if(!params['user']) {
unprivshwrap(params['user'], cmd)
} else {
shwrap(cmd)
}

if (!params['srcConfig']) {
params['srcConfig'] = "https://github.com/coreos/fedora-coreos-config"
Expand All @@ -33,21 +39,37 @@ def call(params = [:]) {
if (params['variant']) {
initArgs += " --variant ${params['variant']}"
}
shwrap("cd ${cosaDir} && cosa init ${initArgs} ${params['srcConfig']}")
utils.cosaCmd(cosaDir: cosaDir, user: params['user'], args: "init ${initArgs} ${params['srcConfig']}")
}

if (params['make']) {
shwrap("make && make install DESTDIR=${cosaDir}/overrides/rootfs")
cmd = "make && make install DESTDIR=${cosaDir}/overrides/rootfs"
if(!params['user']) {
unprivshwrap(params['user'], cmd)
} else {
shwrap(cmd)
}
}

if (params['makeDirs']) {
params['makeDirs'].each{
shwrap("make -C ${it} && make -C ${it} install DESTDIR=${cosaDir}/overrides/rootfs")
cmd = "make -C ${it} && make -C ${it} install DESTDIR=${cosaDir}/overrides/rootfs"
if(!params['user']) {
unprivshwrap(params['user'], cmd)
} else {
shwrap(cmd)
}
}
}

if (params['overlays']) {
params['overlays'].each{
shwrap("rsync -av ${it}/ ${cosaDir}/overrides/rootfs")
cmd = "rsync -av ${it}/ ${cosaDir}/overrides/rootfs"
if(!params['user']) {
unprivshwrap(params['user'], cmd)
} else {
shwrap(cmd)
}
}
}
if (!params['noStrict']) {
Expand All @@ -58,9 +80,9 @@ def call(params = [:]) {
extraArgs = "--force ${extraArgs}"
}

shwrap("cd ${cosaDir} && cosa fetch ${extraFetchArgs}")
shwrap("cd ${cosaDir} && cosa build ${extraArgs}")
shwrap("cd ${cosaDir} && cosa osbuild qemu")
utils.cosaCmd(cosaDir: cosaDir, user: params['user'], args: "fetch ${extraFetchArgs}")
utils.cosaCmd(cosaDir: cosaDir, user: params['user'], args: "build ${extraArgs}")
utils.cosaCmd(cosaDir: cosaDir, user: params['user'], args: "osbuild qemu")
}

if (!params['skipKola']) {
Expand Down
18 changes: 18 additions & 0 deletions vars/unprivshwrap.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Run command with none root
// See https://github.com/coreos/rpm-ostree/pull/4585
def call(username, cmds) {
if (username == null) {
error("Error: username should not be null")
}
// default is HOME=/ which normally we don't have access to.
// Also if umask is somehow unset, fix it.
withEnv(["HOME=${env.WORKSPACE}"]) {
sh """
set -xeuo pipefail
if [ `umask` = 0000 ]; then
umask 0022
fi
sudo -u ${username} ${cmds}
"""
}
}