Skip to content

[pull] master from CycloneDX:master #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 11, 2025
Merged

[pull] master from CycloneDX:master #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c65267
Added support for changed (bug?) format with oras 1.3.0 (#2281)
malice00 Sep 10, 2025
c84783e
Made curl not silent and follow relocations (#2282)
malice00 Sep 10, 2025
e1b5c1b
Bazel can also be downloaded from Nexus when running on self-hosted (…
malice00 Sep 10, 2025
0b1f392
Found some more binary downloads that can be proxied (#2284)
malice00 Sep 10, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/image-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ env:
NEXUS_ALPINE_REPO_PATH: /repository/alpine
NEXUS_COMPOSER_PATH: /repository/composer
NEXUS_DEBIAN_REPO_PATH: /repository/debian
NEXUS_DOTNETCLI_PATH: /repository/dotnetcli
NEXUS_GITHUB_PATH: /repository/github
NEXUS_GOOGLE_PATH: /repository/google
NEXUS_NODEJS_PATH: /repository/nodejs
NEXUS_NPM_REPO_PATH: /repository/npm
NEXUS_NUGET_REPO_PATH: /repository/nuget
Expand Down Expand Up @@ -86,7 +88,9 @@ jobs:
"ALPINE_REPO=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_ALPINE_REPO_PATH"
"COMPOSER_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_COMPOSER_PATH"
"DEBIAN_REPO=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_DEBIAN_REPO_PATH"
"DOTNETCLI_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_DOTNETCLI_PATH"
"GITHUB_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_GITHUB_PATH"
"GOOGLE_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_GOOGLE_PATH"
"NODEJS_DIST_URL=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_NODEJS_PATH/dist"
"NPM_REPO=$NPM_REPO"
"NUGET_REPO=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_NUGET_REPO_PATH"
Expand Down
4 changes: 2 additions & 2 deletions ci/images/Dockerfile.java11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ RUN set -e; \
unzip \
wget \
zip \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand All @@ -87,7 +87,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& npm install -g \
corepack \
&& rm -rf $HOME/.npmrc $HOME/.pip \
Expand Down
4 changes: 2 additions & 2 deletions ci/images/Dockerfile.java17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN set -e; \
unzip \
wget \
zip \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand All @@ -91,7 +91,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& pip install \
--no-cache-dir \
--target ${PYTHONPATH} \
Expand Down
4 changes: 2 additions & 2 deletions ci/images/Dockerfile.java17-slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ RUN set -e; \
unzip \
wget \
zip \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand All @@ -86,7 +86,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& npm install -g \
corepack \
&& rm -rf $HOME/.npmrc $HOME/.pip \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/Dockerfile.node20
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& rm -rf $HOME/.npmrc $HOME/.pip \
&& zypper clean -a \
&& if [ -n "$SUSE_REPO" ]; then \
Expand Down
7 changes: 4 additions & 3 deletions ci/images/Dockerfile.python311
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ FROM registry.suse.com/bci/python:3.11 AS base
ARG GCC_VERSION=14
ARG GITHUB_URL=https://github.com
ARG GO_VERSION=1.25.0
ARG GOOGLE_URL=https://dl.google.com
ARG JAVA_VERSION=24.0.2-tem
ARG MAVEN_VERSION=3.9.11
# renovate: datasource=docker depName=node
Expand Down Expand Up @@ -81,7 +82,7 @@ RUN set -e; \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_VERSION} 10 \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand All @@ -90,7 +91,7 @@ RUN set -e; \
&& sdk install java $JAVA_VERSION \
&& sdk install maven $MAVEN_VERSION \
&& mv /root/.sdkman/candidates/* /opt/ \
&& curl -LO "https://dl.google.com/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
&& curl -LO "${GOOGLE_URL}/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
&& tar -C /usr/local -xzf go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
&& rm go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
&& go telemetry off \
Expand Down Expand Up @@ -121,7 +122,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& rm -rf $HOME/.npmrc $HOME/.pip \
&& zypper clean -a \
&& if [ -n "$SUSE_REPO" ]; then \
Expand Down
4 changes: 2 additions & 2 deletions ci/images/Dockerfile.python312
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ RUN set -e; \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_VERSION} 10 \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand Down Expand Up @@ -114,7 +114,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& rm -rf $HOME/.npmrc $HOME/.pip \
&& zypper clean -a \
&& if [ -n "$SUSE_REPO" ]; then \
Expand Down
4 changes: 2 additions & 2 deletions ci/images/Dockerfile.python313
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN set -e; \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_VERSION} 10 \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand Down Expand Up @@ -106,7 +106,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& rm -rf $HOME/.npmrc $HOME/.pip \
&& zypper clean -a \
&& if [ -n "$SUSE_REPO" ]; then \
Expand Down
4 changes: 2 additions & 2 deletions ci/images/Dockerfile.python36
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN set -e; \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 10 \
&& update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_VERSION} 10 \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand Down Expand Up @@ -109,7 +109,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& npm install -g \
corepack \
&& rm -rf $HOME/.npmrc $HOME/.pip \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/alpine/Dockerfile.php84
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN set -e; \
pdo_mysql \
xml \
zip \
&& curl -sS $COMPOSER_URL/installer \
&& curl -L $COMPOSER_URL/installer \
| sed "s|\$uriScheme.'://getcomposer.org'|'$COMPOSER_URL'|g" \
| php \
-- \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/debian/Dockerfile.php83
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ RUN set -e; \
pdo_mysql \
xml \
zip \
&& curl -sS $COMPOSER_URL/installer \
&& curl -L $COMPOSER_URL/installer \
| sed "s|\$uriScheme.'://getcomposer.org'|'$COMPOSER_URL'|g" \
| php \
-- \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/debian/Dockerfile.php84
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ RUN set -e; \
pdo_mysql \
xml \
zip \
&& curl -sS $COMPOSER_URL/installer \
&& curl -L $COMPOSER_URL/installer \
| sed "s|\$uriScheme.'://getcomposer.org'|'$COMPOSER_URL'|g" \
| php \
-- \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/debian/Dockerfile.swift6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ RUN set -e; \
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
&& echo $SWIFT_BIN_URL \
&& export GNUPGHOME="$(mktemp -d)" \
&& curl -fsSL \
&& curl -L \
"$SWIFT_BIN_URL" -o swift.tar.gz \
"$SWIFT_SIG_URL" -o swift.tar.gz.sig \
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/debian/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if [ x"${SKIP_ATOM}" != "xyes" ]; then
fi

if [ x"${JAVA_VERSION}" != "x" ]; then
curl -s "https://get.sdkman.io" | bash
curl -L "https://get.sdkman.io" | bash
SDKMAN_BROKER_API="${SDKMAN_URL}/broker"
SDKMAN_CANDIDATES_API="${SDKMAN_URL}"
chmod +x /root/.sdkman/bin/sdkman-init.sh
Expand Down
5 changes: 3 additions & 2 deletions ci/images/opensuse/Dockerfile.python310
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM registry.opensuse.org/opensuse/bci/python:3.10 AS base

ARG GITHUB_URL=https://github.com
ARG GO_VERSION=1.25.0
ARG GOOGLE_URL=https://dl.google.com
ARG NODEJS_DIST_URL
ARG NPM_REPO
ARG OPENSUSE_CODECS_REPO
Expand Down Expand Up @@ -98,7 +99,7 @@ RUN set -e; \
pipenv \
poetry \
uv \
&& curl -LO "https://dl.google.com/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
&& curl -LO "$GOOGLE_URL/go/go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz" \
&& tar -C /usr/local -xzf go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
&& rm go${GO_VERSION}.linux-${GOBIN_VERSION}.tar.gz \
&& go telemetry off \
Expand All @@ -116,7 +117,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& rm -rf $HOME/.npmrc $HOME/.pip \
&& zypper clean -a \
&& if [ -n "$OPENSUSE_REPO" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/opensuse/Dockerfile.python39
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& rm -rf $HOME/.npmrc $HOME/.pip \
&& zypper clean -a \
&& if [ -n "$OPENSUSE_REPO" ]; then \
Expand Down
9 changes: 5 additions & 4 deletions ci/images/opensuse/Dockerfile.rolling
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
FROM opensuse/tumbleweed:latest AS base

ARG DOTNET_SDK_VERSION=9.0.100
ARG DOTNETCLI_URL=https://dotnetcli.azureedge.net
ARG GITHUB_URL=https://github.com
ARG GRADLE_VERSION=8.14.3
ARG MAVEN_VERSION=4.0.0-rc-3
Expand Down Expand Up @@ -104,7 +105,7 @@ RUN set -e; \
&& update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 10 \
&& update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-14 10 \
&& update-alternatives --install /usr/bin/python python /usr/bin/python3.12 10 \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand All @@ -117,8 +118,8 @@ RUN set -e; \
&& sdk offline enable \
&& mv /root/.sdkman/candidates/* /opt/ \
&& rm -rf /root/.sdkman \
&& curl -fSL --output dotnet.tar.gz \
https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-${OS_ARCH_SUFFIX}.tar.gz \
&& curl -L --output dotnet.tar.gz \
$DOTNETCLI_URL/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-${OS_ARCH_SUFFIX}.tar.gz \
&& mkdir -p /usr/share/dotnet \
&& tar -xf dotnet.tar.gz -C /usr/share/dotnet \
&& rm dotnet.tar.gz \
Expand All @@ -144,7 +145,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel \
$GITHUB_URL/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& BAZELISK_BASE_URL=$GITHUB_URL/bazelbuild/bazel/releases/download bazel --version \
&& rm -rf $HOME/.npmrc $HOME/.pip \
&& zypper clean -a \
&& if [ -n "$OPENSUSE_REPO" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/temurin/Dockerfile.java21
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ RUN set -e; \
&& source ${NVM_DIR}/nvm.sh \
&& nvm install ${NODE_VERSION} \
&& node --version \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/temurin/Dockerfile.java24
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ RUN set -e; \
&& source ${NVM_DIR}/nvm.sh \
&& nvm install ${NODE_VERSION} \
&& node --version \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand Down
2 changes: 1 addition & 1 deletion ci/images/temurin/Dockerfile.java8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ RUN set -e; \
&& source ${NVM_DIR}/nvm.sh \
&& nvm install ${NODE_VERSION} \
&& node --version \
&& curl -s "https://get.sdkman.io" | bash \
&& curl -L "https://get.sdkman.io" | bash \
&& SDKMAN_BROKER_API="$SDKMAN_URL/broker" \
&& SDKMAN_CANDIDATES_API="$SDKMAN_URL" \
&& printf "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true\nsdkman_curl_connect_timeout=20\nsdkman_curl_max_time=0" \
Expand Down
26 changes: 20 additions & 6 deletions lib/managers/oci.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,26 @@ export function getBomWithOras(image, platform = undefined) {
const out = Buffer.from(result.stdout).toString();
try {
const manifestObj = JSON.parse(out);
if (
manifestObj?.manifests?.length &&
Array.isArray(manifestObj.manifests) &&
manifestObj.manifests[0]?.reference
) {
const imageRef = manifestObj.manifests[0].reference;
let manifest;
if (manifestObj?.manifests) {
if (
manifestObj?.manifests?.length &&
Array.isArray(manifestObj.manifests) &&
manifestObj.manifests[0]?.reference
) {
manifest = manifestObj.manifests[0];
}
} else if (manifestObj?.referrers) {
if (
manifestObj?.referrers?.length &&
Array.isArray(manifestObj.referrers) &&
manifestObj.referrers[0]?.reference
) {
manifest = manifestObj.referrers[0];
}
}
if (manifest != null) {
const imageRef = manifest.reference;
const tmpDir = getTmpDir();
result = safeSpawnSync("oras", ["pull", imageRef, "-o", tmpDir], {
shell: isWin,
Expand Down
Loading