Refactor User.build

This commit is contained in:
jpic 2020-01-26 18:12:15 +01:00
parent ab756be215
commit 2aa657d5ef

View File

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