sam/shlax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ported User command ?

Browse Source 
Did i break other distros it used to work on ?

Does it still work with alpine ?
This commit is contained in:
jpic 2020-01-31 19:27:06 +01:00
parent 66a0d6fcef
commit 3515dd2590
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
podctl/visitors/user.py
View File

@ -25,10 +25,10 @@ class User:
def build(self, script): def build(self, script):
script.append(f''' script.append(f'''
if {script._run('id ' + str(self.uid))}; then if {script._run('id ' + str(self.uid))}; then
i=$({script._run('id -n ' + str(self.uid))}) i=$({script._run('id -gn ' + str(self.uid))})
{script._run('usermod --home-dir ' + self.home + ' --no-log-init ' + str(self.uid) + ' $i')} {script._run('usermod -d ' + self.home + ' -l ' + self.username + ' $i')}
else else
{script._run('useradd --home-dir ' + self.home + ' --uid ' + str(self.uid) + ' ' + self.username)} {script._run('useradd -d ' + self.home + ' -u ' + str(self.uid) + ' ' + self.username)}
fi fi
''') # noqa ''') # noqa
self.user_created = True self.user_created = True

6
tests/test_build_user.sh
View File

@ -33,10 +33,10 @@ buildah run --user root $ctr -- apk upgrade
buildah run --user root $ctr -- apk add shadow buildah run --user root $ctr -- apk add shadow
echo "User.build" echo "User.build"
if buildah run $ctr -- id 1000; then if buildah run $ctr -- id 1000; then
i=$(buildah run $ctr -- id -n 1000) i=$(buildah run $ctr -- id -gn 1000)
buildah run $ctr -- usermod --home-dir /app --no-log-init 1000 $i buildah run $ctr -- usermod -d /app -l app $i
else else
buildah run $ctr -- useradd --home-dir /app --uid 1000 app buildah run $ctr -- useradd -d /app -u 1000 app
fi fi
echo "User.post_build" echo "User.post_build"
buildah config --user app $ctr buildah config --user app $ctr