Skip to content

Commit

Permalink
Install Ruby 3.4.0 in container images (#1528)
Browse files Browse the repository at this point in the history
* Install ruby 3.4.0

Signed-off-by: Prabhu Subramanian <[email protected]>

* Tweaks

Signed-off-by: Prabhu Subramanian <[email protected]>

---------

Signed-off-by: Prabhu Subramanian <[email protected]>
  • Loading branch information
prabhu authored Jan 5, 2025
1 parent 415dc72 commit 3c8f917
Show file tree
Hide file tree
Showing 10 changed files with 94 additions and 32 deletions.
1 change: 1 addition & 0 deletions .github/workflows/npm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 28 additions & 8 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM almalinux:10-kitten-minimal
FROM almalinux:9.5-minimal

LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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

Expand All @@ -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 \
Expand All @@ -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" \
Expand All @@ -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/ \
Expand All @@ -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 \
Expand Down
36 changes: 28 additions & 8 deletions ci/Dockerfile-bun
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM almalinux:10-kitten-minimal
FROM almalinux:9.5-minimal

LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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}')"; \
Expand All @@ -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 \
Expand All @@ -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" \
Expand All @@ -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/ \
Expand All @@ -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 \
Expand Down
35 changes: 28 additions & 7 deletions ci/Dockerfile-deno
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM almalinux:10-kitten-minimal
FROM almalinux:9.5-minimal

LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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}')"; \
Expand All @@ -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 \
Expand All @@ -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" \
Expand Down Expand Up @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions ci/Dockerfile-ppc64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM almalinux:10-kitten-minimal
FROM almalinux:9.5-minimal

LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
Expand All @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/sle/Dockerfile.java17
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/sle/Dockerfile.java17-slim
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion contrib/lima/cdxgen-opensuse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion contrib/lima/cdxgen-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"bugs": {
"url": "https://github.com/cyclonedx/cdxgen/issues"
},
"packageManager": "[email protected].1",
"packageManager": "[email protected].2",
"lint-staged": {
"*": "biome check --fix --no-errors-on-unmatched"
},
Expand Down

0 comments on commit 3c8f917

Please sign in to comment.