From 91f2f004d7ca8d57bebb9e1a9f3dcbc360c1f43f Mon Sep 17 00:00:00 2001
From: prabhu <7842+prabhu@users.noreply.github.com>
Date: Wed, 15 Jan 2025 00:06:58 +0000
Subject: [PATCH] Introduce atom-tools to the container images (#1562)

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
---
 ci/Dockerfile                                   | 2 +-
 ci/Dockerfile-bun                               | 2 +-
 ci/Dockerfile-deno                              | 2 +-
 ci/base-images/cdxgen/Dockerfile.dotnet6        | 2 +-
 ci/base-images/cdxgen/Dockerfile.dotnet7        | 2 +-
 ci/base-images/cdxgen/Dockerfile.dotnet8        | 2 +-
 ci/base-images/cdxgen/Dockerfile.dotnet9        | 2 +-
 ci/base-images/cdxgen/Dockerfile.java           | 2 +-
 ci/base-images/cdxgen/Dockerfile.java17         | 2 +-
 ci/base-images/cdxgen/Dockerfile.node20         | 3 ++-
 ci/base-images/cdxgen/Dockerfile.python         | 2 +-
 ci/base-images/cdxgen/Dockerfile.python310      | 3 ++-
 ci/base-images/cdxgen/Dockerfile.python311      | 3 ++-
 ci/base-images/cdxgen/Dockerfile.rolling        | 4 ++--
 ci/base-images/cdxgen/Dockerfile.ruby25         | 1 +
 ci/base-images/cdxgen/debian/Dockerfile.dotnet6 | 2 +-
 ci/base-images/cdxgen/debian/Dockerfile.dotnet8 | 2 +-
 ci/base-images/cdxgen/debian/Dockerfile.dotnet9 | 2 +-
 ci/base-images/cdxgen/debian/Dockerfile.ruby33  | 1 +
 ci/base-images/cdxgen/debian/Dockerfile.ruby34  | 1 +
 ci/base-images/opensuse/Dockerfile.lang         | 2 +-
 21 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/ci/Dockerfile b/ci/Dockerfile
index cd14e9391..708442b1e 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -92,7 +92,7 @@ RUN set -e; \
     && alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \
     && /usr/bin/python${PYTHON_VERSION} --version \
     && /usr/bin/python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pip virtualenv \
-    && /usr/bin/python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint uv --target /opt/pypi \
+    && /usr/bin/python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint atom-tools uv --target /opt/pypi \
     && /opt/pypi/bin/poetry --version \
     && /opt/pypi/bin/pipenv --version \
     && /opt/pypi/bin/blint --help \
diff --git a/ci/Dockerfile-bun b/ci/Dockerfile-bun
index c675d7a63..c0d5cd63a 100644
--- a/ci/Dockerfile-bun
+++ b/ci/Dockerfile-bun
@@ -78,7 +78,7 @@ RUN set -e; \
     && alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \
     && python${PYTHON_VERSION} --version \
     && python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pip virtualenv \
-    && python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint uv --target /opt/pypi \
+    && python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint atom-tools uv --target /opt/pypi \
     && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
     && cargo --version \
     && rustc --version \
diff --git a/ci/Dockerfile-deno b/ci/Dockerfile-deno
index 1ed3c82de..1b3da27a4 100644
--- a/ci/Dockerfile-deno
+++ b/ci/Dockerfile-deno
@@ -87,7 +87,7 @@ RUN set -e; \
     && alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \
     && python${PYTHON_VERSION} --version \
     && python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pip virtualenv \
-    && python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint uv --target /opt/pypi \
+    && python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint atom-tools uv --target /opt/pypi \
     && curl -fsSL https://deno.land/x/install/install.sh | sh \
     && deno install -g --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net -n cdxgen --node-modules-dir=auto "npm:@cyclonedx/cdxgen/cdxgen" \
     && deno install -g --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write -n atom "npm:@appthreat/atom/atom" \
diff --git a/ci/base-images/cdxgen/Dockerfile.dotnet6 b/ci/base-images/cdxgen/Dockerfile.dotnet6
index 07b509058..8b43ed2ed 100644
--- a/ci/base-images/cdxgen/Dockerfile.dotnet6
+++ b/ci/base-images/cdxgen/Dockerfile.dotnet6
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.dotnet7 b/ci/base-images/cdxgen/Dockerfile.dotnet7
index c0b0e31c1..ca3223f7c 100644
--- a/ci/base-images/cdxgen/Dockerfile.dotnet7
+++ b/ci/base-images/cdxgen/Dockerfile.dotnet7
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.dotnet8 b/ci/base-images/cdxgen/Dockerfile.dotnet8
index 921f214dd..38009298a 100644
--- a/ci/base-images/cdxgen/Dockerfile.dotnet8
+++ b/ci/base-images/cdxgen/Dockerfile.dotnet8
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.dotnet9 b/ci/base-images/cdxgen/Dockerfile.dotnet9
index d7c39b248..ad5fffda9 100644
--- a/ci/base-images/cdxgen/Dockerfile.dotnet9
+++ b/ci/base-images/cdxgen/Dockerfile.dotnet9
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.java b/ci/base-images/cdxgen/Dockerfile.java
index a28f97467..13f0c72eb 100644
--- a/ci/base-images/cdxgen/Dockerfile.java
+++ b/ci/base-images/cdxgen/Dockerfile.java
@@ -21,7 +21,7 @@
 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.java17 b/ci/base-images/cdxgen/Dockerfile.java17
index eacff431e..df8ae940a 100644
--- a/ci/base-images/cdxgen/Dockerfile.java17
+++ b/ci/base-images/cdxgen/Dockerfile.java17
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.node20 b/ci/base-images/cdxgen/Dockerfile.node20
index 108b813df..a29799dc5 100644
--- a/ci/base-images/cdxgen/Dockerfile.node20
+++ b/ci/base-images/cdxgen/Dockerfile.node20
@@ -13,13 +13,14 @@ LABEL maintainer="CycloneDX" \
 
 ENV CDXGEN_IN_CONTAINER=true \
     NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
-ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.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 \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.python b/ci/base-images/cdxgen/Dockerfile.python
index 4fd42ee26..1b31ecde8 100644
--- a/ci/base-images/cdxgen/Dockerfile.python
+++ b/ci/base-images/cdxgen/Dockerfile.python
@@ -31,7 +31,7 @@ RUN source /root/.nvm/nvm.sh \
     && zypper --non-interactive install -l --no-recommends clang7 llvm7 llvm7-devel libcurl-devel libjpeg62-devel libmariadb-devel \
         postgresql-devel postgresql16-server-devel libopenssl-devel libopenblas_pthreads-devel lapacke-devel \
     && python3 -m pip install --no-cache-dir --upgrade pip virtualenv \
-    && python3 -m pip install --no-cache-dir --upgrade --user pipenv poetry blint uv \
+    && python3 -m pip install --no-cache-dir --upgrade --user pipenv poetry blint atom-tools uv \
     && 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 \
diff --git a/ci/base-images/cdxgen/Dockerfile.python310 b/ci/base-images/cdxgen/Dockerfile.python310
index f559823bf..a0c182bc5 100644
--- a/ci/base-images/cdxgen/Dockerfile.python310
+++ b/ci/base-images/cdxgen/Dockerfile.python310
@@ -15,7 +15,7 @@ ENV CDXGEN_IN_CONTAINER=true \
     SAFE_PIP_INSTALL=true \
     NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
     CRYPTOGRAPHY_DONT_BUILD_RUST=1 \
-    PATH=${PATH}:/opt/cdxgen/node_modules/.bin:
+    PATH=${PATH}:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 
 COPY . /opt/cdxgen
 
@@ -24,6 +24,7 @@ RUN zypper --non-interactive install --allow-downgrade -l --no-recommends readli
     && 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 \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && chmod a-w -R /opt \
     && zypper clean -a
 
diff --git a/ci/base-images/cdxgen/Dockerfile.python311 b/ci/base-images/cdxgen/Dockerfile.python311
index 2e660c2a8..b4f476be9 100644
--- a/ci/base-images/cdxgen/Dockerfile.python311
+++ b/ci/base-images/cdxgen/Dockerfile.python311
@@ -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:/opt/cdxgen/node_modules/.bin:
+    PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
 
 COPY . /opt/cdxgen
 
@@ -34,6 +34,7 @@ RUN source /root/.nvm/nvm.sh \
     && 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 \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && chmod a-w -R /opt \
     && zypper clean -a
 
diff --git a/ci/base-images/cdxgen/Dockerfile.rolling b/ci/base-images/cdxgen/Dockerfile.rolling
index 6cad27edd..8c21a0990 100644
--- a/ci/base-images/cdxgen/Dockerfile.rolling
+++ b/ci/base-images/cdxgen/Dockerfile.rolling
@@ -16,14 +16,14 @@ ENV CDXGEN_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:
+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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/Dockerfile.ruby25 b/ci/base-images/cdxgen/Dockerfile.ruby25
index 9e4148a47..de62eed14 100644
--- a/ci/base-images/cdxgen/Dockerfile.ruby25
+++ b/ci/base-images/cdxgen/Dockerfile.ruby25
@@ -24,6 +24,7 @@ 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 \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && rbastgen --help \
     && rm -rf ${CDXGEN_GEM_HOME} && mkdir -p ${CDXGEN_GEM_HOME} \
     && chmod a-w -R /opt
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.dotnet6 b/ci/base-images/cdxgen/debian/Dockerfile.dotnet6
index 62e76a563..3008dbd0a 100644
--- a/ci/base-images/cdxgen/debian/Dockerfile.dotnet6
+++ b/ci/base-images/cdxgen/debian/Dockerfile.dotnet6
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.dotnet8 b/ci/base-images/cdxgen/debian/Dockerfile.dotnet8
index ac3295b92..8310ee8c6 100644
--- a/ci/base-images/cdxgen/debian/Dockerfile.dotnet8
+++ b/ci/base-images/cdxgen/debian/Dockerfile.dotnet8
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.dotnet9 b/ci/base-images/cdxgen/debian/Dockerfile.dotnet9
index f0ff2eaf5..61f73941d 100644
--- a/ci/base-images/cdxgen/debian/Dockerfile.dotnet9
+++ b/ci/base-images/cdxgen/debian/Dockerfile.dotnet9
@@ -21,7 +21,7 @@ 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 \
-    && pip install --upgrade --no-cache-dir blint --target /opt/pypi \
+    && pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
     && chmod a-w -R /opt
 
 ENTRYPOINT ["node", "/opt/cdxgen/bin/cdxgen.js"]
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby33 b/ci/base-images/cdxgen/debian/Dockerfile.ruby33
index d9d349115..994b8481f 100644
--- a/ci/base-images/cdxgen/debian/Dockerfile.ruby33
+++ b/ci/base-images/cdxgen/debian/Dockerfile.ruby33
@@ -24,6 +24,7 @@ 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 \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && rbastgen --help \
     && rm -rf ${CDXGEN_GEM_HOME} && mkdir -p ${CDXGEN_GEM_HOME} \
     && chmod a-w -R /opt
diff --git a/ci/base-images/cdxgen/debian/Dockerfile.ruby34 b/ci/base-images/cdxgen/debian/Dockerfile.ruby34
index 42a71a279..d1a5746cd 100644
--- a/ci/base-images/cdxgen/debian/Dockerfile.ruby34
+++ b/ci/base-images/cdxgen/debian/Dockerfile.ruby34
@@ -22,6 +22,7 @@ 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 \
+    && pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
     && rbastgen --help \
     && rm -rf ${CDXGEN_GEM_HOME} && mkdir -p ${CDXGEN_GEM_HOME} \
     && chmod a-w -R /opt
diff --git a/ci/base-images/opensuse/Dockerfile.lang b/ci/base-images/opensuse/Dockerfile.lang
index 8d1731052..8e6e4b69c 100644
--- a/ci/base-images/opensuse/Dockerfile.lang
+++ b/ci/base-images/opensuse/Dockerfile.lang
@@ -60,7 +60,7 @@ RUN set -e; \
     && rm dotnet.tar.gz \
     && dotnet --list-sdks \
     && mkdir /opt/pypi \
-    && python -m pip install --no-cache-dir --upgrade poetry pipenv blint custom-json-diff uv --target /opt/pypi \
+    && python -m pip install --no-cache-dir --upgrade poetry pipenv blint atom-tools custom-json-diff uv --target /opt/pypi \
     && node -v \
     && npm -v \
     && npm install -g corepack \