Skip to content

Commit 6bcd591

Browse files
test
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent ccb04b8 commit 6bcd591

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

build/dockerfiles/linux-libc-ubi9.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,9 @@ RUN NODE_ARCH=$(echo "console.log(process.arch)" | node) \
8181
&& cp -r ../vscode-reh-web-linux-${NODE_ARCH} /checode \
8282
# cache shared libs from this image to provide them to a user's container
8383
&& mkdir -p /checode/ld_libs/core /checode/ld_libs/openssl \
84-
&& find /lib /lib64 /usr/lib64 -name 'ld-linux-*.so*' -exec cp -L -t /checode/ld_libs/core/ {} + \
85-
&& find /usr/lib64 -name 'libbrotli*' -exec cp -P -t /checode/ld_libs/core/ {} + \
86-
&& find /usr/lib64 -name 'libnode.so*' -exec cp -P -t /checode/ld_libs/core/ {} + \
87-
&& find /usr/lib64 -name 'libz.so*' -exec cp -P -t /checode/ld_libs/core/ {} + \
84+
&& find /usr/lib64 -name 'libbrotli*' -exec cp -P -t /checode/ld_libs {} + \
85+
&& find /usr/lib64 -name 'libnode.so*' -exec cp -P -t /checode/ld_libs {} + \
86+
&& find /usr/lib64 -name 'libz.so*' -exec cp -P -t /checode/ld_libs {} + \
8887
&& find /usr/lib64 -name 'libssl.so*' -exec cp -P -t /checode/ld_libs/openssl/ {} + \
8988
&& find /usr/lib64 -name 'libcrypto.so*' -exec cp -P -t /checode/ld_libs/openssl/ {} +
9089

build/scripts/entrypoint-volume.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ case "$ldd_output" in
9595
;;
9696
*"3"*)
9797
echo "[INFO] Using linux-libc ubi9-based assembly..."
98-
runtime_ld_library_path="/checode/checode-linux-libc/ubi9/ld_libs/core"
98+
runtime_ld_library_path="/checode/checode-linux-libc/ubi9/ld_libs"
9999
if [ -d "/checode/checode-linux-libc/ubi9/ld_libs/openssl" ]; then
100100
runtime_ld_library_path="/checode/checode-linux-libc/ubi9/ld_libs/openssl:${runtime_ld_library_path}"
101101
fi
102102
cd /checode/checode-linux-libc/ubi9 || exit
103103
;;
104104
*)
105105
echo "[WARNING] Unsupported OpenSSL major version, linux-libc ubi9-based assembly will be used by default..."
106-
runtime_ld_library_path="/checode/checode-linux-libc/ubi9/ld_libs/core"
106+
runtime_ld_library_path="/checode/checode-linux-libc/ubi9/ld_libs"
107107
if [ -d "/checode/checode-linux-libc/ubi9/ld_libs/openssl" ]; then
108108
runtime_ld_library_path="/checode/checode-linux-libc/ubi9/ld_libs/openssl:${runtime_ld_library_path}"
109109
fi

0 commit comments

Comments
 (0)