Skip to content

Commit

Permalink
Update atom for Ruby (#1549)
Browse files Browse the repository at this point in the history
* Update atom to get Ruby frontend

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

* Use built node_modules

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

* Debug Ruby command detection

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

* Debug Ruby command detection

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

---------

Signed-off-by: Prabhu Subramanian <[email protected]>
  • Loading branch information
prabhu authored Jan 11, 2025
1 parent 8dfdb4b commit 971f509
Show file tree
Hide file tree
Showing 34 changed files with 191 additions and 169 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
test/
docs/
contrib/
**/node_modules
2 changes: 1 addition & 1 deletion appimage-reqs.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
APPDIR=$1
OPTDIR=${APPDIR}/opt
NODE_VERSION=18.16.0
NODE_VERSION=20.17.0
export PATH=$PATH:${APPDIR}/usr/bin:

curl -LO "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" \
Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
org.opencontainers.image.source="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.url="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.version="11.0.x" \
org.opencontainers.image.version="11.1.x" \
org.opencontainers.image.vendor="cyclonedx" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.title="cdxgen" \
Expand Down Expand Up @@ -64,7 +64,7 @@ ENV GOPATH=/opt/app-root/go \
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:/root/.rbenv/versions/${RUBY_VERSION}/bin:
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:/root/.rbenv/versions/3.4.1/bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-bun
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
org.opencontainers.image.source="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.url="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.version="11.0.x" \
org.opencontainers.image.version="11.1.x" \
org.opencontainers.image.vendor="cyclonedx" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.title="cdxgen" \
Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile-deno
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
org.opencontainers.image.source="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.url="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.version="11.0.x" \
org.opencontainers.image.version="11.1.x" \
org.opencontainers.image.vendor="cyclonedx" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.title="cdxgen" \
Expand Down Expand Up @@ -61,7 +61,7 @@ ENV GOPATH=/opt/app-root/go \
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:/root/.rbenv/versions/${RUBY_VERSION}/bin:
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:/root/.rbenv/versions/3.4.1/bin:

RUN set -e; \
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-ppc64
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="cyclonedx" \
org.opencontainers.image.authors="Prabhu Subramanian <[email protected]>" \
org.opencontainers.image.source="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.url="https://github.com/cyclonedx/cdxgen" \
org.opencontainers.image.version="11.0.x" \
org.opencontainers.image.version="11.1.x" \
org.opencontainers.image.vendor="cyclonedx" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.title="cdxgen" \
Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.dotnet6
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.dotnet7
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.dotnet8
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.dotnet9
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.java-slim
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL maintainer="CycloneDX" \

ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
ENV PATH=${PATH}:/usr/local/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.java17
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.java17-slim
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL maintainer="CycloneDX" \

ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
ENV PATH=${PATH}:/usr/local/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.node20
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL maintainer="CycloneDX" \

ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
ENV PATH=${PATH}:/usr/local/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.python
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENV NVM_DIR="/root/.nvm" \
CDXGEN_IN_CONTAINER=true \
SAFE_PIP_INSTALL=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:
PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
3 changes: 2 additions & 1 deletion ci/base-images/cdxgen/Dockerfile.python310
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
SAFE_PIP_INSTALL=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
CRYPTOGRAPHY_DONT_BUILD_RUST=1
CRYPTOGRAPHY_DONT_BUILD_RUST=1 \
PATH=${PATH}:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.python311
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV NVM_DIR="/root/.nvm" \
SAFE_PIP_INSTALL=true \
CRYPTOGRAPHY_DONT_BUILD_RUST=1 \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:
PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/Dockerfile.python36
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV NVM_DIR="/root/.nvm" \
SAFE_PIP_INSTALL=true \
CRYPTOGRAPHY_DONT_BUILD_RUST=1 \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:
PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
3 changes: 2 additions & 1 deletion ci/base-images/cdxgen/Dockerfile.python39
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
SAFE_PIP_INSTALL=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
CRYPTOGRAPHY_DONT_BUILD_RUST=1
CRYPTOGRAPHY_DONT_BUILD_RUST=1 \
PATH=${PATH}:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
14 changes: 7 additions & 7 deletions ci/base-images/cdxgen/Dockerfile.rolling
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
FROM ghcr.io/cyclonedx/opensuse-lang:master

ENV CDXGEN_DEBUG_MODE=debug \
SCAN_DEBUG_MODE=debug \
CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:

LABEL maintainer="CycloneDX" \
org.opencontainers.image.authors="Team AppThreat <[email protected]>" \
org.opencontainers.image.source="https://github.com/CycloneDX/cdxgen" \
Expand All @@ -18,6 +11,13 @@ LABEL maintainer="CycloneDX" \
org.opencontainers.image.description="Rolling image with cdxgen SBOM generator based on tumbleweed" \
org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-rolling:v11 -r /app --server"

ENV CDXGEN_DEBUG_MODE=debug \
SCAN_DEBUG_MODE=debug \
CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin::/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
Expand Down
5 changes: 4 additions & 1 deletion ci/base-images/cdxgen/Dockerfile.ruby25
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
CDXGEN_GEM_HOME="/tmp/gems" \
ATOM_RUBY_HOME=/root/.rbenv/versions/3.4.1 \
RUBY_CMD=/root/.rbenv/versions/3.4.1/bin/ruby \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
&& mkdir -p /opt/cdxgen-node-cache \
&& node /opt/cdxgen/bin/cdxgen.js --help \
&& rbastgen --help \
&& rm -rf ${CDXGEN_GEM_HOME} && mkdir -p ${CDXGEN_GEM_HOME} \
&& chmod a-w -R /opt

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/debian/Dockerfile.dotnet6
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/debian/Dockerfile.dotnet8
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
2 changes: 1 addition & 1 deletion ci/base-images/cdxgen/debian/Dockerfile.dotnet9
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

Expand Down
5 changes: 4 additions & 1 deletion ci/base-images/cdxgen/debian/Dockerfile.ruby33
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ LABEL maintainer="CycloneDX" \
ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
CDXGEN_GEM_HOME="/tmp/gems" \
ATOM_RUBY_HOME=/root/.rbenv/versions/3.4.1 \
RUBY_CMD=/root/.rbenv/versions/3.4.1/bin/ruby \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
&& mkdir -p /opt/cdxgen-node-cache \
&& node /opt/cdxgen/bin/cdxgen.js --help \
&& rbastgen --help \
&& rm -rf ${CDXGEN_GEM_HOME} && mkdir -p ${CDXGEN_GEM_HOME} \
&& chmod a-w -R /opt

Expand Down
3 changes: 2 additions & 1 deletion ci/base-images/cdxgen/debian/Dockerfile.ruby34
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ ENV CDXGEN_IN_CONTAINER=true \
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
CDXGEN_GEM_HOME="/tmp/gems" \
PYTHONPATH=/opt/pypi
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:

COPY . /opt/cdxgen

RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy && corepack pnpm cache delete \
&& mkdir -p /opt/cdxgen-node-cache \
&& node /opt/cdxgen/bin/cdxgen.js --help \
&& rbastgen --help \
&& rm -rf ${CDXGEN_GEM_HOME} && mkdir -p ${CDXGEN_GEM_HOME} \
&& chmod a-w -R /opt

Expand Down
2 changes: 2 additions & 0 deletions ci/base-images/debian/Dockerfile.ruby33
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ FROM ruby:3.3.6

ARG JAVA_VERSION=23.0.1-tem
ARG NODE_VERSION=23.6.0
ARG ATOM_RUBY_VERSION=3.4.1

ENV JAVA_VERSION=$JAVA_VERSION \
JAVA_HOME="/opt/java/${JAVA_VERSION}" \
ATOM_RUBY_VERSION=$ATOM_RUBY_VERSION \
LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8 \
LANGUAGE=en_US.UTF-8 \
Expand Down
4 changes: 4 additions & 0 deletions ci/base-images/debian/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ source ~/.bashrc
mkdir -p "$(rbenv root)/plugins"
git clone https://github.com/rbenv/ruby-build.git --depth=1 "$(rbenv root)/plugins/ruby-build"

if [ x"${ATOM_RUBY_VERSION}" != "x" ]; then
rbenv install $ATOM_RUBY_VERSION
fi

curl -s "https://get.sdkman.io" | bash
chmod +x /root/.sdkman/bin/sdkman-init.sh
source $HOME/.sdkman/bin/sdkman-init.sh
Expand Down
5 changes: 5 additions & 0 deletions ci/base-images/sle/Dockerfile.ruby25
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
FROM registry.suse.com/bci/ruby:2.5

ARG ATOM_RUBY_VERSION=3.4.1

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} \
JAVA_OPTIONS="-Dhttps.protocols=TLSv1.1,TLSv1.2"

ENV PATH=${PATH}:/usr/local/bin:/root/.local/bin:/root/.rbenv/bin:
Expand Down Expand Up @@ -32,6 +36,7 @@ RUN set -e; \
&& 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 ${ATOM_RUBY_VERSION} \
&& zypper clean -a

CMD /bin/bash
4 changes: 2 additions & 2 deletions deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "11.0.11",
"version": "11.1.0",
"exports": "./lib/cli/index.js",
"compilerOptions": {
"lib": ["deno.window"],
Expand Down Expand Up @@ -48,7 +48,7 @@
"gen-types": "npx -p typescript tsc"
},
"imports": {
"@appthreat/atom": "npm:@appthreat/atom@2.0.25",
"@appthreat/atom": "npm:@appthreat/atom@2.1.2",
"@appthreat/cdx-proto": "npm:@appthreat/[email protected]",
"@babel/parser": "npm:@babel/parser@^7.26.3",
"@babel/traverse": "npm:@babel/traverse@^7.26.4",
Expand Down
2 changes: 1 addition & 1 deletion jsr.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyclonedx/cdxgen",
"version": "11.0.11",
"version": "11.1.0",
"exports": "./lib/cli/index.js",
"include": ["*.js", "lib/**", "bin/**", "data/**", "types/**"],
"exclude": [
Expand Down
Loading

0 comments on commit 971f509

Please sign in to comment.