Skip to content

Commit eccf2a9

Browse files
test via relocate_binaries LIBS and FILES
Signed-off-by: Nikita Korolev <[email protected]>
1 parent 2b8264a commit eccf2a9

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

images/virt-launcher/werf.inc.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
image: {{ $.ImageName }}
33
final: true
44
fromImage: distroless
5-
cacheVersion: "1042025.1"
5+
cacheVersion: "1042025.2"
66
import:
77
- image: {{ $.ImageName }}-binaries
88
add: /relocate
@@ -104,6 +104,7 @@ libs:
104104
- libbsd-devel
105105
- libsystemd-devel
106106
- libjson-c-devel
107+
- libjson-c5
107108
- systemtap-sdt-devel
108109
- libacl-devel
109110
- libtpms-devel libtpms
@@ -271,7 +272,7 @@ import:
271272
before: setup
272273
includePaths:
273274
- temp_pod
274-
cacheVersion: "1042025.1"
275+
cacheVersion: "1042025.2"
275276
shell:
276277
beforeInstall:
277278
- |
@@ -300,20 +301,21 @@ shell:
300301
echo "========="
301302
302303
echo "find and copy additional bins"
303-
LIST=($(find /VBINS/usr/bin/ -type f))
304-
LIST+=($(find /VBINS/usr/sbin/ -type f))
305-
LIBS+=("/usr/lib64/libbsd.so* /usr/lib64/libnbd.so* /usr/lib64/libfuse3.so*")
304+
FILES=($(find /VBINS/usr/bin/ -type f))
305+
FILES+=($(find /VBINS/usr/sbin/ -type f))
306+
LIBS=("/usr/lib64/libbsd.so* /usr/lib64/libnbd.so* /usr/lib64/libfuse3.so*")
306307
LIBS+=("/usr/lib64/libjson-c.so* /usr/lib64/libssh.so*")
307308
LIBS+=("/usr/lib64/libtpms.so* /usr/lib64/swtpm/libswtpm_libtpms.so*")
308-
LIBS+=("/usr/lib64/libxml2.so* /usr/lib64/libgcc_s.so*")
309+
LIBS+=("/usr/lib64/libxml2.so* /usr/lib64/libgcc_s*")
309310
310311
echo "relocate additional list of files"
311-
./relocate_binaries.sh -i "$LIST" -o /VBINS
312+
./relocate_binaries.sh -i "$FILES" -o /VBINS
313+
./relocate_binaries.sh -i "$LIBS" -o /VBINS
312314
313-
for lib in "${LIBS[@]}"; do
314-
echo "relocate $lib"
315-
copy -a $lib /VBINS
316-
done
315+
# for lib in "${LIBS[@]}"; do
316+
# echo "relocate $lib"
317+
# copy -a $lib /VBINS/usr/lib64
318+
# done
317319
318320
echo "List libs in VBINS"
319321
ls -la /VBINS/usr/lib64/

0 commit comments

Comments
 (0)