Skip to content

Commit 2f456c6

Browse files
committed
Keep the system CA store when callers set NODE_OPTIONS
The entrypoint now prepends --use-openssl-ca to a caller-supplied NODE_OPTIONS (e.g. a heap limit) instead of letting it replace the image default, unless the caller already picked a CA store. Also trims the 2.11.2 changelog entry to what users will notice.
1 parent 02ddcc2 commit 2f456c6

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

‎scripts/docker-entrypoint.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
# Set GOROOT from the value determined at build time
88
export GOROOT=$(cat /etc/goroot)
99

10+
# Keep Node on the system CA store (see NODE_OPTIONS in the Dockerfile) when the
11+
# caller sets their own NODE_OPTIONS, e.g. a heap limit. Leave an explicit CA
12+
# store choice alone, since Node rejects conflicting CA flags.
13+
case " ${NODE_OPTIONS:-} " in
14+
*" --use-openssl-ca "*|*" --use-bundled-ca "*|*" --use-system-ca "*) ;;
15+
*) export NODE_OPTIONS="--use-openssl-ca${NODE_OPTIONS:+ $NODE_OPTIONS}" ;;
16+
esac
17+
1018
# Check if we have any arguments
1119
if [ $# -eq 0 ]; then
1220
# No arguments provided, run socketcli with no args (will show help)

0 commit comments

Comments
 (0)