Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion image/scanner/rhel/create-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ cp "${INPUT_ROOT}/scripts/entrypoint.sh" "${OUTPUT_DIR}/scripts"
cp "${INPUT_ROOT}/scripts/import-additional-cas" "${OUTPUT_DIR}/scripts"
cp "${INPUT_ROOT}/scripts/restore-all-dir-contents" "${OUTPUT_DIR}/scripts"
cp "${INPUT_ROOT}/scripts/save-dir-contents" "${OUTPUT_DIR}/scripts"
cp "${INPUT_ROOT}/scripts/trust-root-ca" "${OUTPUT_DIR}/scripts"

# =============================================================================
# Add binaries and data files to be included in the Dockerfile here. This
Expand Down
1 change: 0 additions & 1 deletion image/scanner/scripts/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ set -euo pipefail

/restore-all-dir-contents
/import-additional-cas
/trust-root-ca

exec /scanner
8 changes: 8 additions & 0 deletions image/scanner/scripts/import-additional-cas
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ copy_existing /usr/local/share/ca-certificates
# Copy the custom trusted CA bundles injected by the Openshift Network Operator.
copy_existing /etc/pki/injected-ca-trust

# Copy the StackRox root CA if available (mounted by the operator).
# Only copy ca.pem — the mount also contains server cert and key which
# should not be added as trusted CA anchors.
CA_PATH="/run/secrets/stackrox.io/certs/ca.pem"
echo "Copying StackRox root CA from '${CA_PATH}'"
# For RHEL
cp "${CA_PATH}" /etc/pki/ca-trust/source/anchors/root-ca.pem

echo "Updating CA trust"
# Though /etc/pki/ca-trust/extracted is the default output, update-ca-trust
# will create the necessary directories with the required permissions if the `--output` flag is used.
Expand Down
16 changes: 0 additions & 16 deletions image/scanner/scripts/trust-root-ca

This file was deleted.