Fetch license by default for python (#15)

* Fetch license by default for python Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> * Install master branch in rolling version Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> --------- Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
AppThreat · Jun 19, 2024 · cd42644 · cd42644
1 parent 1b552c6
commit cd42644
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/cdxgen/Dockerfile.python b/cdxgen/Dockerfile.python
@@ -21,6 +21,7 @@ ENV NVM_DIR="/root/.nvm" \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
     CDXGEN_NO_BANNER=true \
+    FETCH_LICENSE=true \
     PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:
 
 RUN source /root/.nvm/nvm.sh \

diff --git a/cdxgen/Dockerfile.python310 b/cdxgen/Dockerfile.python310
@@ -11,7 +11,8 @@ LABEL maintainer="AppThreat" \
       org.opencontainers.image.description="Rolling image with cdxgen SBOM generator for python 3.10 apps" \
       org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/appthreat/cdxgen-python310:v10 -r /app --server"
 
-ENV CDXGEN_NO_BANNER=true
+ENV CDXGEN_NO_BANNER=true \
+    FETCH_LICENSE=true
 
 RUN zypper --non-interactive install --allow-downgrade -l --no-recommends readline-devel clang13 llvm13 llvm13-devel libjpeg62-devel libmariadb-devel \
         postgresql16-devel postgresql16-server-devel libopenssl-devel libopenblas_pthreads-devel lapacke-devel \

diff --git a/cdxgen/Dockerfile.python311 b/cdxgen/Dockerfile.python311
@@ -21,6 +21,7 @@ ENV NVM_DIR="/root/.nvm" \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
     CDXGEN_NO_BANNER=true \
+    FETCH_LICENSE=true \
     PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:
 
 RUN source /root/.nvm/nvm.sh \

diff --git a/cdxgen/Dockerfile.python36 b/cdxgen/Dockerfile.python36
@@ -21,6 +21,7 @@ ENV NVM_DIR="/root/.nvm" \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
     CDXGEN_NO_BANNER=true \
+    FETCH_LICENSE=true \
     PATH=${PATH}:/root/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:
 
 RUN source /root/.nvm/nvm.sh \

diff --git a/cdxgen/Dockerfile.python39 b/cdxgen/Dockerfile.python39
@@ -11,7 +11,8 @@ LABEL maintainer="AppThreat" \
       org.opencontainers.image.description="Rolling image with cdxgen SBOM generator for python 3.9 apps" \
       org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/appthreat/cdxgen-python39:v10 -r /app --server"
 
-ENV CDXGEN_NO_BANNER=true
+ENV CDXGEN_NO_BANNER=true \
+    FETCH_LICENSE=true
 
 RUN zypper --non-interactive install --allow-downgrade -l --no-recommends readline-devel clang13 llvm13 llvm13-devel libjpeg62-devel libmariadb-devel \
         postgresql16-devel postgresql16-server-devel libopenssl-devel libopenblas_pthreads-devel lapacke-devel \

diff --git a/cdxgen/Dockerfile.rolling b/cdxgen/Dockerfile.rolling
@@ -15,6 +15,6 @@ LABEL maintainer="AppThreat" \
       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/appthreat/cdxgen-rolling:v10 -r /app --server"
 
-RUN npm install -g @cyclonedx/cdxgen --omit=dev
+RUN npm install -g git+https://github.com/CycloneDX/cdxgen --omit=dev
 
 ENTRYPOINT ["cdxgen"]