diff --git a/ci/base-images/sle/Dockerfile.ruby25 b/ci/base-images/sle/Dockerfile.ruby25 index e4dba5b2b..c369d2cdb 100644 --- a/ci/base-images/sle/Dockerfile.ruby25 +++ b/ci/base-images/sle/Dockerfile.ruby25 @@ -6,7 +6,7 @@ ENV LC_ALL=en_US.UTF-8 \ LANG=en_US.UTF-8 \ LANGUAGE=en_US.UTF-8 \ ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \ - ATOM_RUBY_HOME=/root/.rbenv/versions/${ATOM_RUBY_VERSION} \ + ATOM_RUBY_HOME=/root/.rbenv/versions/3.4.1 \ BUNDLE_SILENCE_ROOT_WARNING=true \ JAVA_OPTIONS="-Dhttps.protocols=TLSv1.1,TLSv1.2" \ RUBY_BUILD_BUILD_PATH="/tmp/rbenv" \ diff --git a/lib/cli/index.js b/lib/cli/index.js index 910d61808..9a9da0aba 100644 --- a/lib/cli/index.js +++ b/lib/cli/index.js @@ -2439,7 +2439,7 @@ export async function createNodejsBom(path, options) { if (process.env?.CDXGEN_IN_CONTAINER === "true") { if (arch() !== "x64") { console.log( - `INFO: Many npm packages have limited support for ${arch()} architecture.\nRun the cdxgen container image with --platform=linux/amd64 for best experience.`, + `INFO: Many npm packages have limited support for ${arch()} architecture. Run the cdxgen container image with --platform=linux/amd64 for best experience.`, ); } else { console.log( diff --git a/lib/helpers/envcontext.js b/lib/helpers/envcontext.js index c35cea444..e9feb0d69 100644 --- a/lib/helpers/envcontext.js +++ b/lib/helpers/envcontext.js @@ -924,7 +924,7 @@ export function performBundleInstall( ) { if (arch() !== "x64") { console.log( - `INFO: Many Ruby packages have limited support for ${arch()} architecture.\nRun the cdxgen container image with --platform=linux/amd64 for best experience.`, + `INFO: Many Ruby packages have limited support for ${arch()} architecture. Run the cdxgen container image with --platform=linux/amd64 for best experience.`, ); } let installArgs = ["install"]; diff --git a/lib/stages/pregen/pregen.js b/lib/stages/pregen/pregen.js index a8678ec6e..49c6142d1 100644 --- a/lib/stages/pregen/pregen.js +++ b/lib/stages/pregen/pregen.js @@ -80,7 +80,7 @@ export function preparePythonEnv(_filePath, options) { if (hasAnyProjectType(["python"], options, false)) { if (process.env?.CDXGEN_IN_CONTAINER !== "true" && arch() !== "x64") { console.log( - `INFO: Many pypi packages have limited support for ${arch()} architecture.\nRun the cdxgen container image with --platform=linux/amd64 for best experience.`, + `INFO: Many pypi packages have limited support for ${arch()} architecture. Run the cdxgen container image with --platform=linux/amd64 for best experience.`, ); } if (platform() === "win32") { @@ -276,7 +276,7 @@ export function prepareSwiftEnv(filePath, options) { arch() !== "x64" ) { console.log( - "INFO: Swift for Linux has known issues on non x64 machines.\nRun the cdxgen container image with --platform=linux/amd64 for best experience.", + "INFO: Swift for Linux has known issues on non x64 machines. Run the cdxgen container image with --platform=linux/amd64 for best experience.", ); } if (options.deep || options?.lifecycle?.includes("post-build")) {