Skip to content

Commit 15505e6

Browse files
fix terminal
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent 2b97211 commit 15505e6

2 files changed

Lines changed: 2 additions & 22 deletions

File tree

build/dockerfiles/linux-libc-ubi8.Dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,7 @@ RUN NODE_ARCH=$(echo "console.log(process.arch)" | node) \
8585
&& find /usr/lib64 -name 'libnode.so*' -exec cp -P -t /checode/ld_libs/ {} + \
8686
&& find /usr/lib64 -name 'libz.so*' -exec cp -P -t /checode/ld_libs/ {} + \
8787
&& find /usr/lib64 -name 'libssl.so*' -exec cp -P -t /checode/ld_libs/ {} + \
88-
&& find /usr/lib64 -name 'libcrypto.so*' -exec cp -P -t /checode/ld_libs/ {} + \
89-
# Keep runtime libs scoped to bundled node without global LD_LIBRARY_PATH.
90-
&& cp /checode/node /checode/node.real \
91-
&& NODE_LOADER=$(ldd /checode/node.real | awk '$1 ~ /^\/.*ld.*so/ { print $1; exit }') \
92-
&& [ -n "$NODE_LOADER" ] \
93-
&& printf '%s\n' \
94-
'#!/bin/sh' \
95-
'SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)' \
96-
"exec \"$NODE_LOADER\" --library-path \"\$SCRIPT_DIR/ld_libs\" \"\$SCRIPT_DIR/node.real\" \"\$@\"" \
97-
> /checode/node \
98-
&& chmod 0755 /checode/node
88+
&& find /usr/lib64 -name 'libcrypto.so*' -exec cp -P -t /checode/ld_libs/ {} +
9989

10090
RUN chmod a+x /checode/out/server-main.js \
10191
&& chgrp -R 0 /checode && chmod -R g+rwX /checode

build/dockerfiles/linux-libc-ubi9.Dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,7 @@ RUN NODE_ARCH=$(echo "console.log(process.arch)" | node) \
8585
&& find /usr/lib64 -name 'libnode.so*' -exec cp -P -t /checode/ld_libs/ {} + \
8686
&& find /usr/lib64 -name 'libz.so*' -exec cp -P -t /checode/ld_libs/ {} + \
8787
&& find /usr/lib64 -name 'libssl.so*' -exec cp -P -t /checode/ld_libs/ {} + \
88-
&& find /usr/lib64 -name 'libcrypto.so*' -exec cp -P -t /checode/ld_libs/ {} + \
89-
# Keep runtime libs scoped to bundled node without global LD_LIBRARY_PATH.
90-
&& cp /checode/node /checode/node.real \
91-
&& NODE_LOADER=$(ldd /checode/node.real | awk '$1 ~ /^\/.*ld.*so/ { print $1; exit }') \
92-
&& [ -n "$NODE_LOADER" ] \
93-
&& printf '%s\n' \
94-
'#!/bin/sh' \
95-
'SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)' \
96-
"exec \"$NODE_LOADER\" --library-path \"\$SCRIPT_DIR/ld_libs\" \"\$SCRIPT_DIR/node.real\" \"\$@\"" \
97-
> /checode/node \
98-
&& chmod 0755 /checode/node
88+
&& find /usr/lib64 -name 'libcrypto.so*' -exec cp -P -t /checode/ld_libs/ {} +
9989

10090
RUN chmod a+x /checode/out/server-main.js \
10191
&& chgrp -R 0 /checode && chmod -R g+rwX /checode

0 commit comments

Comments
 (0)