Update base-images

Signed-off-by: Prabhu Subramanian <[email protected]>
AnsahMohammad · Jan 12, 2025 · ee80489 · ee80489
1 parent 3d88690
commit ee80489
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 12 deletions.
diff --git a/appimage-reqs.sh b/appimage-reqs.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 APPDIR=$1
 OPTDIR=${APPDIR}/opt
-NODE_VERSION=20.17.0
+NODE_VERSION=20.18.1
 export PATH=$PATH:${APPDIR}/usr/bin:
 
 curl -LO "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" \

diff --git a/ci/base-images/cdxgen/Dockerfile.python311 b/ci/base-images/cdxgen/Dockerfile.python311
@@ -11,7 +11,7 @@ LABEL maintainer="CycloneDX" \
       org.opencontainers.image.description="Rolling image with cdxgen SBOM generator for Python 3.11 apps" \
       org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-python311:v11 -r /app --server"
 
-ARG NODE_VERSION=20.17.0
+ARG NODE_VERSION=20.18.1
 
 ENV NVM_DIR="/root/.nvm" \
     PYTHON_CMD=python3 \

diff --git a/ci/base-images/cdxgen/Dockerfile.python36 b/ci/base-images/cdxgen/Dockerfile.python36
@@ -11,7 +11,7 @@ LABEL maintainer="CycloneDX" \
       org.opencontainers.image.description="Rolling image with cdxgen SBOM generator for Python 3.6 apps" \
       org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-python36:v11 -r /app --server"
 
-ARG NODE_VERSION=20.17.0
+ARG NODE_VERSION=20.18.1
 
 ENV NVM_DIR="/root/.nvm" \
     PYTHON_CMD=python3 \

diff --git a/ci/base-images/debian/Dockerfile.ruby18 b/ci/base-images/debian/Dockerfile.ruby18
@@ -1,7 +1,6 @@
 FROM debian:jessie
 
 ARG JAVA_VERSION=23.0.1-tem
-ARG NODE_VERSION=20.17.0
 ARG ATOM_RUBY_VERSION=3.4.1
 ARG BUNDLER_VERSION=1.17.3
 ARG RAKE_VERSION=0.7.3
@@ -18,9 +17,8 @@ ENV JAVA_VERSION=$JAVA_VERSION \
     BUNDLE_SILENCE_ROOT_WARNING=true \
     LC_ALL=en_US.UTF-8 \
     LANG=en_US.UTF-8 \
-    LANGUAGE=en_US.UTF-8 \
-    NVM_DIR="/root/.nvm"
-ENV PATH=/usr/local/rvm/gems/ruby-${RUBY_VERSION}/bin:/usr/local/rvm/gems/ruby-${RUBY_VERSION}@global/bin:/usr/local/rvm/rubies/ruby-${RUBY_VERSION}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/rvm/bin:${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:/usr/local/bin:/root/.local/bin:/root/.rbenv/bin:
+    LANGUAGE=en_US.UTF-8
+ENV PATH=/usr/local/rvm/gems/ruby-${RUBY_VERSION}/bin:/usr/local/rvm/gems/ruby-${RUBY_VERSION}@global/bin:/usr/local/rvm/rubies/ruby-${RUBY_VERSION}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/rvm/bin:${PATH}:/usr/local/bin:/root/.local/bin:/root/.rbenv/bin:
 
 COPY ci/base-images/debian/install.sh /tmp/
 

diff --git a/ci/base-images/debian/Dockerfile.ruby33 b/ci/base-images/debian/Dockerfile.ruby33
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -qq -y --no-install-recommends curl bash b
     && ./tmp/install.sh && rm /tmp/install.sh \
     && node -v \
     && npm -v \
-    && gem install bundler --no-ri --no-rdoc \
+    && gem install bundler \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/ci/base-images/debian/Dockerfile.ruby34 b/ci/base-images/debian/Dockerfile.ruby34
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -qq -y --no-install-recommends curl bash b
     && ./tmp/install.sh && rm /tmp/install.sh \
     && node -v \
     && npm -v \
-    && gem install bundler --no-ri --no-rdoc \
+    && gem install bundler \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/ci/base-images/sle/Dockerfile.python311 b/ci/base-images/sle/Dockerfile.python311
@@ -3,7 +3,7 @@ FROM registry.suse.com/bci/python:3.11
 ARG JAVA_VERSION=23.0.1-tem
 ARG MAVEN_VERSION=3.9.9
 ARG GCC_VERSION=13
-ARG NODE_VERSION=20.17.0
+ARG NODE_VERSION=20.18.1
 
 ENV JAVA_VERSION=$JAVA_VERSION \
     MAVEN_VERSION=$MAVEN_VERSION \

diff --git a/ci/base-images/sle/Dockerfile.python36 b/ci/base-images/sle/Dockerfile.python36
@@ -3,7 +3,7 @@ FROM registry.suse.com/bci/python:3.6
 ARG JAVA_VERSION=23.0.1-tem
 ARG MAVEN_VERSION=3.9.9
 ARG GCC_VERSION=13
-ARG NODE_VERSION=20.17.0
+ARG NODE_VERSION=20.18.1
 
 ENV JAVA_VERSION=$JAVA_VERSION \
     MAVEN_VERSION=$MAVEN_VERSION \

diff --git a/ci/base-images/sle/Dockerfile.ruby25 b/ci/base-images/sle/Dockerfile.ruby25
@@ -26,7 +26,7 @@ RUN set -e; \
             ;; \
         *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
     esac \
-    && zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core java-21-openjdk-devel nodejs20 npm20 python311 python311-pip wget zip unzip make gawk \
+    && zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core java-21-openjdk-devel nodejs20 npm20 python311 python311-pip wget zip unzip make gawk rust \
     && npm install -g corepack \
     && gem install bundler -v 2.3.27 \
     && gem install rubygems-update -v 3.3.27 \