From 3c8f917ec504f5a9700363e9833297f0c21e1afb Mon Sep 17 00:00:00 2001 From: prabhu <7842+prabhu@users.noreply.github.com> Date: Sun, 5 Jan 2025 10:19:00 +0000 Subject: [PATCH] Install Ruby 3.4.0 in container images (#1528) * Install ruby 3.4.0 Signed-off-by: Prabhu Subramanian * Tweaks Signed-off-by: Prabhu Subramanian --------- Signed-off-by: Prabhu Subramanian --- .github/workflows/npm-release.yml | 1 + ci/Dockerfile | 36 ++++++++++++++++++----- ci/Dockerfile-bun | 36 ++++++++++++++++++----- ci/Dockerfile-deno | 35 +++++++++++++++++----- ci/Dockerfile-ppc64 | 8 ++--- ci/base-images/sle/Dockerfile.java17 | 2 +- ci/base-images/sle/Dockerfile.java17-slim | 2 +- contrib/lima/cdxgen-opensuse.yaml | 2 +- contrib/lima/cdxgen-ubuntu.yaml | 2 +- package.json | 2 +- 10 files changed, 94 insertions(+), 32 deletions(-) diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml index 1149cfff6..b35a28a66 100644 --- a/.github/workflows/npm-release.yml +++ b/.github/workflows/npm-release.yml @@ -65,6 +65,7 @@ jobs: with: node-version: '23.x' registry-url: https://registry.npmjs.org/ + - uses: oras-project/setup-oras@v1 - name: Trim CI agent run: | chmod +x contrib/free_disk_space.sh diff --git a/ci/Dockerfile b/ci/Dockerfile index cd21542ab..a8758430a 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM almalinux:10-kitten-minimal +FROM almalinux:9.5-minimal LABEL maintainer="cyclonedx" \ org.opencontainers.image.authors="Prabhu Subramanian " \ @@ -17,12 +17,13 @@ ARG SWIFT_BRANCH=swift-6.0.1-release ARG SWIFT_VERSION=swift-6.0.1-RELEASE ARG SWIFT_WEBROOT=https://download.swift.org ARG JAVA_VERSION=23.0.1-tem -ARG SBT_VERSION=1.10.5 +ARG SBT_VERSION=1.10.7 ARG MAVEN_VERSION=3.9.9 ARG GRADLE_VERSION=8.11 ARG GO_VERSION=1.23.3 ARG NODE_VERSION=23.5.0 ARG PYTHON_VERSION=3.12 +ARG RUBY_VERSION=3.4.0 ENV GOPATH=/opt/app-root/go \ JAVA_VERSION=$JAVA_VERSION \ @@ -36,6 +37,7 @@ ENV GOPATH=/opt/app-root/go \ SBT_HOME="/root/.sdkman/candidates/sbt/${SBT_VERSION}" \ PYTHON_VERSION=3.12 \ PYTHON_CMD=/usr/bin/python3.12 \ + RUBY_VERSION=$RUBY_VERSION \ PYTHONUNBUFFERED=1 \ PYTHONIOENCODING="utf-8" \ COMPOSER_ALLOW_SUPERUSER=1 \ @@ -56,8 +58,13 @@ ENV GOPATH=/opt/app-root/go \ CDXGEN_IN_CONTAINER=true \ SDKMAN_DIR=/root/.sdkman \ SDKMAN_CANDIDATES_DIR=/root/.sdkman/candidates \ - npm_config_python=/usr/bin/python3.12 -ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/root/.cargo/bin:/opt/pypi/bin: + npm_config_python=/usr/bin/python3.12 \ + MALLOC_CONF="dirty_decay_ms:2000,narenas:2,background_thread:true" \ + RUBY_CONFIGURE_OPTS="--with-jemalloc --enable-yjit" \ + RUBYOPT="--yjit" \ + RUBY_BUILD_BUILD_PATH="/tmp/rbenv" \ + RUBY_BUILD_HTTP_CLIENT=curl +ENV PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/root/.cargo/bin:/opt/pypi/bin:/root/.rbenv/bin: COPY . /opt/cdxgen @@ -76,8 +83,11 @@ RUN set -e; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac \ && microdnf install -y php php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make gcc git-core \ - python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip ruby ruby-devel glibc-common glibc-all-langpacks \ - pcre2 which tar gzip zip unzip bzip2 sudo ncurses sqlite-devel gnupg2 dotnet-sdk-9.0 \ + python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip glibc-common glibc-all-langpacks \ + openssl-devel libffi-devel libyaml zlib-devel \ + pcre2 which tar gzip zip unzip bzip2 sudo ncurses ncurses-devel sqlite-devel gnupg2 dotnet-sdk-9.0 \ + && microdnf install -y epel-release \ + && microdnf install --enablerepo=crb -y libyaml-devel jemalloc-devel \ && alternatives --install /usr/bin/python3 python /usr/bin/python${PYTHON_VERSION} 10 \ && alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \ && /usr/bin/python${PYTHON_VERSION} --version \ @@ -93,6 +103,17 @@ RUN set -e; \ && source /root/.nvm/nvm.sh \ && nvm install ${NODE_VERSION} \ && node --version \ + && git clone https://github.com/rbenv/rbenv.git --depth=1 ~/.rbenv \ + && echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \ + && echo 'eval "$(~/.rbenv/bin/rbenv init - bash)"' >> ~/.bashrc \ + && source ~/.bashrc \ + && mkdir -p "$(rbenv root)/plugins" \ + && git clone https://github.com/rbenv/ruby-build.git --depth=1 "$(rbenv root)/plugins/ruby-build" \ + && rbenv install ${RUBY_VERSION} \ + && rbenv global ${RUBY_VERSION} \ + && ruby --version \ + && which ruby \ + && rm -rf /root/.rbenv/cache $RUBY_BUILD_BUILD_PATH \ && curl -s "https://get.sdkman.io" | bash \ && echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" >> $HOME/.sdkman/etc/config \ && source "$HOME/.sdkman/bin/sdkman-init.sh" \ @@ -112,7 +133,6 @@ RUN set -e; \ && chmod +x /usr/bin/swift \ && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \ && swift --version \ - && microdnf install -y epel-release \ && mkdir -p ${ANDROID_HOME}/cmdline-tools \ && curl -L https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o ${ANDROID_HOME}/cmdline-tools/android_tools.zip \ && unzip ${ANDROID_HOME}/cmdline-tools/android_tools.zip -d ${ANDROID_HOME}/cmdline-tools/ \ @@ -131,7 +151,7 @@ RUN set -e; \ && /usr/local/bin/lein \ && curl -L -O https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh \ && chmod +x linux-install.sh \ - && sudo ./linux-install.sh \ + && ./linux-install.sh \ && curl -L --output /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \ && chmod +x /usr/local/bin/bazel \ && useradd -ms /bin/bash cyclonedx \ diff --git a/ci/Dockerfile-bun b/ci/Dockerfile-bun index f34965e08..f4d9b326f 100644 --- a/ci/Dockerfile-bun +++ b/ci/Dockerfile-bun @@ -1,4 +1,4 @@ -FROM almalinux:10-kitten-minimal +FROM almalinux:9.5-minimal LABEL maintainer="cyclonedx" \ org.opencontainers.image.authors="Prabhu Subramanian " \ @@ -17,11 +17,12 @@ ARG SWIFT_BRANCH=swift-6.0.1-release ARG SWIFT_VERSION=swift-6.0.1-RELEASE ARG SWIFT_WEBROOT=https://download.swift.org ARG JAVA_VERSION=23.0.1-tem -ARG SBT_VERSION=1.10.5 +ARG SBT_VERSION=1.10.7 ARG MAVEN_VERSION=3.9.9 ARG GRADLE_VERSION=8.11 ARG GO_VERSION=1.23.3 ARG PYTHON_VERSION=3.12 +ARG RUBY_VERSION=3.4.0 ENV GOPATH=/opt/app-root/go \ JAVA_VERSION=$JAVA_VERSION \ @@ -35,6 +36,7 @@ ENV GOPATH=/opt/app-root/go \ SBT_HOME="/root/.sdkman/candidates/sbt/${SBT_VERSION}" \ PYTHON_VERSION=3.12 \ PYTHON_CMD=/usr/bin/python3.12 \ + RUBY_VERSION=$RUBY_VERSION \ PYTHONUNBUFFERED=1 \ PYTHONIOENCODING="utf-8" \ COMPOSER_ALLOW_SUPERUSER=1 \ @@ -51,8 +53,13 @@ ENV GOPATH=/opt/app-root/go \ CDXGEN_IN_CONTAINER=true \ SDKMAN_DIR=/root/.sdkman \ SDKMAN_CANDIDATES_DIR=/root/.sdkman/candidates \ - PYTHONPATH=/opt/pypi -ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/root/.bun/bin:/root/.cargo/bin:/opt/pypi/bin: + PYTHONPATH=/opt/pypi \ + MALLOC_CONF="dirty_decay_ms:2000,narenas:2,background_thread:true" \ + RUBY_CONFIGURE_OPTS="--with-jemalloc --enable-yjit" \ + RUBYOPT="--yjit" \ + RUBY_BUILD_BUILD_PATH="/tmp/rbenv" \ + RUBY_BUILD_HTTP_CLIENT=curl +ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/root/.bun/bin:/root/.cargo/bin:/opt/pypi/bin:/root/.rbenv/bin: RUN set -e; \ ARCH_NAME="$(rpm --eval '%{_arch}')"; \ @@ -69,8 +76,11 @@ RUN set -e; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac \ && microdnf install -y php php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make gcc git-core \ - python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip ruby ruby-devel glibc-common glibc-all-langpacks \ - pcre2 which tar gzip zip unzip bzip2 sudo ncurses sqlite-devel gnupg2 dotnet-sdk-9.0 \ + python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip glibc-common glibc-all-langpacks \ + openssl-devel libffi-devel libyaml zlib-devel \ + pcre2 which tar gzip zip unzip bzip2 sudo ncurses ncurses-devel sqlite-devel gnupg2 dotnet-sdk-9.0 \ + && microdnf install -y epel-release \ + && microdnf install --enablerepo=crb -y libyaml-devel jemalloc-devel \ && alternatives --install /usr/bin/python3 python /usr/bin/python${PYTHON_VERSION} 10 \ && alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \ && python${PYTHON_VERSION} --version \ @@ -81,6 +91,17 @@ RUN set -e; \ && rustc --version \ && curl -fsSL https://bun.sh/install | bash \ && ln -s /root/.bun/bin/bun /usr/bin/node \ + && git clone https://github.com/rbenv/rbenv.git --depth=1 ~/.rbenv \ + && echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \ + && echo 'eval "$(~/.rbenv/bin/rbenv init - bash)"' >> ~/.bashrc \ + && source ~/.bashrc \ + && mkdir -p "$(rbenv root)/plugins" \ + && git clone https://github.com/rbenv/ruby-build.git --depth=1 "$(rbenv root)/plugins/ruby-build" \ + && rbenv install ${RUBY_VERSION} \ + && rbenv global ${RUBY_VERSION} \ + && ruby --version \ + && which ruby \ + && rm -rf /root/.rbenv/cache $RUBY_BUILD_BUILD_PATH \ && curl -s "https://get.sdkman.io" | bash \ && echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true" >> $HOME/.sdkman/etc/config \ && source "$HOME/.sdkman/bin/sdkman-init.sh" \ @@ -101,7 +122,6 @@ RUN set -e; \ && chmod +x /usr/bin/swift \ && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \ && swift --version \ - && microdnf install -y epel-release \ && mkdir -p ${ANDROID_HOME}/cmdline-tools \ && curl -L https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o ${ANDROID_HOME}/cmdline-tools/android_tools.zip \ && unzip ${ANDROID_HOME}/cmdline-tools/android_tools.zip -d ${ANDROID_HOME}/cmdline-tools/ \ @@ -120,7 +140,7 @@ RUN set -e; \ && /usr/local/bin/lein \ && curl -L -O https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh \ && chmod +x linux-install.sh \ - && sudo ./linux-install.sh \ + && ./linux-install.sh \ && useradd -ms /bin/bash cyclonedx \ && pecl channel-update pecl.php.net \ && pecl install timezonedb \ diff --git a/ci/Dockerfile-deno b/ci/Dockerfile-deno index 0d9635ce9..88e7b14d0 100644 --- a/ci/Dockerfile-deno +++ b/ci/Dockerfile-deno @@ -1,4 +1,4 @@ -FROM almalinux:10-kitten-minimal +FROM almalinux:9.5-minimal LABEL maintainer="cyclonedx" \ org.opencontainers.image.authors="Prabhu Subramanian " \ @@ -17,11 +17,12 @@ ARG SWIFT_BRANCH=swift-6.0.1-release ARG SWIFT_VERSION=swift-6.0.1-RELEASE ARG SWIFT_WEBROOT=https://download.swift.org ARG JAVA_VERSION=23.0.1-tem -ARG SBT_VERSION=1.10.5 +ARG SBT_VERSION=1.10.7 ARG MAVEN_VERSION=3.9.9 ARG GRADLE_VERSION=8.11 ARG GO_VERSION=1.23.3 ARG PYTHON_VERSION=3.12 +ARG RUBY_VERSION=3.4.0 ENV GOPATH=/opt/app-root/go \ JAVA_VERSION=$JAVA_VERSION \ @@ -35,6 +36,7 @@ ENV GOPATH=/opt/app-root/go \ SBT_HOME="/root/.sdkman/candidates/sbt/${SBT_VERSION}" \ PYTHON_VERSION=3.12 \ PYTHON_CMD=/usr/bin/python3.12 \ + RUBY_VERSION=$RUBY_VERSION \ PYTHONUNBUFFERED=1 \ PYTHONIOENCODING="utf-8" \ COMPOSER_ALLOW_SUPERUSER=1 \ @@ -53,8 +55,13 @@ ENV GOPATH=/opt/app-root/go \ CDXGEN_IN_CONTAINER=true \ SDKMAN_DIR=/root/.sdkman \ SDKMAN_CANDIDATES_DIR=/root/.sdkman/candidates \ - PYTHONPATH=/opt/pypi -ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/root/.deno/bin:/root/.cargo/bin:/opt/pypi/bin: + PYTHONPATH=/opt/pypi \ + MALLOC_CONF="dirty_decay_ms:2000,narenas:2,background_thread:true" \ + RUBY_CONFIGURE_OPTS="--with-jemalloc --enable-yjit" \ + RUBYOPT="--yjit" \ + RUBY_BUILD_BUILD_PATH="/tmp/rbenv" \ + RUBY_BUILD_HTTP_CLIENT=curl +ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:/root/.deno/bin:/root/.cargo/bin:/opt/pypi/bin:/root/.rbenv/bin: RUN set -e; \ ARCH_NAME="$(rpm --eval '%{_arch}')"; \ @@ -71,8 +78,11 @@ RUN set -e; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac \ && microdnf install -y php php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make gcc git-core \ - python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip ruby ruby-devel glibc-common glibc-all-langpacks \ - pcre2 which tar gzip zip unzip bzip2 sudo ncurses sqlite-devel gnupg2 dotnet-sdk-9.0 \ + python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip glibc-common glibc-all-langpacks \ + openssl-devel libffi-devel libyaml zlib-devel \ + pcre2 which tar gzip zip unzip bzip2 sudo ncurses ncurses-devel sqlite-devel gnupg2 dotnet-sdk-9.0 \ + && microdnf install -y epel-release \ + && microdnf install --enablerepo=crb -y libyaml-devel jemalloc-devel \ && alternatives --install /usr/bin/python3 python /usr/bin/python${PYTHON_VERSION} 10 \ && alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \ && python${PYTHON_VERSION} --version \ @@ -90,6 +100,17 @@ RUN set -e; \ && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ && cargo --version \ && rustc --version \ + && git clone https://github.com/rbenv/rbenv.git --depth=1 ~/.rbenv \ + && echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \ + && echo 'eval "$(~/.rbenv/bin/rbenv init - bash)"' >> ~/.bashrc \ + && source ~/.bashrc \ + && mkdir -p "$(rbenv root)/plugins" \ + && git clone https://github.com/rbenv/ruby-build.git --depth=1 "$(rbenv root)/plugins/ruby-build" \ + && rbenv install ${RUBY_VERSION} \ + && rbenv global ${RUBY_VERSION} \ + && ruby --version \ + && which ruby \ + && rm -rf /root/.rbenv/cache $RUBY_BUILD_BUILD_PATH \ && curl -s "https://get.sdkman.io" | bash \ && echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true" >> $HOME/.sdkman/etc/config \ && source "$HOME/.sdkman/bin/sdkman-init.sh" \ @@ -129,7 +150,7 @@ RUN set -e; \ && /usr/local/bin/lein \ && curl -L -O https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh \ && chmod +x linux-install.sh \ - && sudo ./linux-install.sh \ + && ./linux-install.sh \ && curl -L --output /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \ && chmod +x /usr/local/bin/bazel \ && bazel --version \ diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64 index 03b67b9fd..ef6e24e62 100644 --- a/ci/Dockerfile-ppc64 +++ b/ci/Dockerfile-ppc64 @@ -1,4 +1,4 @@ -FROM almalinux:10-kitten-minimal +FROM almalinux:9.5-minimal LABEL maintainer="cyclonedx" \ org.opencontainers.image.authors="Prabhu Subramanian " \ @@ -11,7 +11,7 @@ LABEL maintainer="cyclonedx" \ org.opencontainers.image.description="Container image for cdxgen SBOM generator" \ org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-ppc64 -r /app --server" -ARG SBT_VERSION=1.10.5 +ARG SBT_VERSION=1.10.7 ARG MAVEN_VERSION=3.9.9 ARG GRADLE_VERSION=8.11 ARG GO_VERSION=1.23.3 @@ -56,7 +56,7 @@ RUN set -e; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac; \ echo -e "[nodejs]\nname=nodejs\nstream=20\nprofiles=\nstate=enabled\n" > /etc/dnf/modules.d/nodejs.module \ - && microdnf install -y php php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make gcc git-core \ + && microdnf install --nodocs -y php php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make gcc git-core \ python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip ruby ruby-devel java-21-openjdk-headless \ pcre2 which tar gzip zip unzip bzip2 sudo nodejs ncurses gnupg2 sqlite-devel \ && alternatives --install /usr/bin/python3 python /usr/bin/python${PYTHON_VERSION} 10 \ @@ -93,7 +93,7 @@ RUN set -e; \ && /usr/local/bin/lein \ && curl -L -O https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh \ && chmod +x linux-install.sh \ - && sudo ./linux-install.sh \ + && ./linux-install.sh \ && useradd -ms /bin/bash cyclonedx \ && npm install --unsafe-perm -g corepack \ && npm install --unsafe-perm -g @microsoft/rush --omit=dev \ diff --git a/ci/base-images/sle/Dockerfile.java17 b/ci/base-images/sle/Dockerfile.java17 index 468ddeefe..43e9345fd 100644 --- a/ci/base-images/sle/Dockerfile.java17 +++ b/ci/base-images/sle/Dockerfile.java17 @@ -1,6 +1,6 @@ FROM registry.suse.com/bci/openjdk-devel:17 -ARG SBT_VERSION=1.10.5 +ARG SBT_VERSION=1.10.7 ARG MAVEN_VERSION=3.9.9 ARG GRADLE_VERSION=8.11 ARG GCC_VERSION=13 diff --git a/ci/base-images/sle/Dockerfile.java17-slim b/ci/base-images/sle/Dockerfile.java17-slim index 1a3ebdd9e..a19a582f5 100644 --- a/ci/base-images/sle/Dockerfile.java17-slim +++ b/ci/base-images/sle/Dockerfile.java17-slim @@ -1,6 +1,6 @@ FROM registry.suse.com/bci/openjdk-devel:17 -ARG SBT_VERSION=1.10.5 +ARG SBT_VERSION=1.10.7 ARG MAVEN_VERSION=3.9.9 ARG GRADLE_VERSION=8.11 diff --git a/contrib/lima/cdxgen-opensuse.yaml b/contrib/lima/cdxgen-opensuse.yaml index 36193868f..3f05a8589 100644 --- a/contrib/lima/cdxgen-opensuse.yaml +++ b/contrib/lima/cdxgen-opensuse.yaml @@ -48,7 +48,7 @@ provision: #!/bin/bash set -e -o pipefail export MAVEN_VERSION=3.9.9 - export SBT_VERSION=1.10.5 + export SBT_VERSION=1.10.7 export GRADLE_VERSION=8.11 export MAVEN_HOME="/.sdkman/candidates/maven/${MAVEN_VERSION}" export GRADLE_HOME="/.sdkman/candidates/gradle/${GRADLE_VERSION}" diff --git a/contrib/lima/cdxgen-ubuntu.yaml b/contrib/lima/cdxgen-ubuntu.yaml index 379cdf9ca..ad68ce27b 100644 --- a/contrib/lima/cdxgen-ubuntu.yaml +++ b/contrib/lima/cdxgen-ubuntu.yaml @@ -42,7 +42,7 @@ provision: #!/bin/bash set -e -o pipefail export MAVEN_VERSION=3.9.9 - export SBT_VERSION=1.10.5 + export SBT_VERSION=1.10.7 export GRADLE_VERSION=8.11 export MAVEN_HOME="/.sdkman/candidates/maven/${MAVEN_VERSION}" export GRADLE_HOME="/.sdkman/candidates/gradle/${GRADLE_VERSION}" diff --git a/package.json b/package.json index 04633c06c..df2807c27 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "bugs": { "url": "https://github.com/cyclonedx/cdxgen/issues" }, - "packageManager": "pnpm@9.15.1", + "packageManager": "pnpm@9.15.2", "lint-staged": { "*": "biome check --fix --no-errors-on-unmatched" },