Skip to content

Commit a6f2099

Browse files
fix
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent f499c8f commit a6f2099

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

images/virt-launcher/configs/qemu.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ vnc_tls = 0
44
vnc_sasl = 0
55
user = "qemu"
66
group = "qemu"
7-
# swtpm_user = "root"
8-
# swtpm_group = "root"
97
dynamic_ownership = 1
108
remember_owner = 0
119
namespaces = [ ]

images/virt-launcher/werf.inc.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
image: {{ $.ImageName }}
33
final: true
44
fromImage: distroless
5-
cacheVersion: "21042025.3"
65
import:
76
- image: {{ $.ImageName }}-binaries
87
add: /relocate
@@ -137,8 +136,6 @@ packages:
137136
- msulogin
138137
- xorriso
139138
binaries:
140-
# debug
141-
- /usr/bin/bash /usr/bin/ldd /usr/bin/ls
142139
# GNU utilities
143140
- /usr/bin/cp
144141
- /usr/bin/sleep
@@ -170,7 +167,6 @@ binaries:
170167
image: {{ $.ImageName }}-binaries
171168
final: false
172169
fromImage: base-alt-p11-binaries
173-
cacheVersion: "21042025.3"
174170
git:
175171
# Add qemu and virtqemud configs
176172
- add: /images/{{ $.ImageName }}/configs
@@ -243,12 +239,12 @@ import:
243239
includePaths:
244240
- node-labeller
245241
- vlctl
246-
# swtpm ===
242+
247243
- image: packages/binaries/swtpm
248244
add: /swtpm
249245
to: /
250246
before: install
251-
# ====
247+
252248
- image: {{ $.ImageName }}-cbuilder
253249
add: /bins
254250
to: /relocate/usr/bin
@@ -260,7 +256,7 @@ shell:
260256
- |
261257
apt-get update && apt-get install -y {{ $virtLauncherDependencies.libs | join " " }} {{ $virtLauncherDependencies.packages | join " " }}
262258
263-
# libtpms libtpms-devel requares version 0.10 that in sisyphus repo
259+
# libtpms libtpms-devel require version 0.10 that in sisyphus repo
264260
cat >/etc/apt/sources.list.d/alt-sisyphus.list<<EOF
265261
rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus x86_64 classic
266262
rpm [alt] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus noarch classic
@@ -313,7 +309,7 @@ shell:
313309
314310
echo "Copy additional config swtpm"
315311
cp -a /etc/{swtpm_setup.conf,swtpm-localca.conf,swtpm-localca.options} /relocate/etc/
316-
312+
317313
echo "Copy xattr config"
318314
cp -a /etc/xattr.conf /relocate/etc
319315

0 commit comments

Comments
 (0)