From d15befeb581dc6600971dd9f2a875d43d5bc8ea2 Mon Sep 17 00:00:00 2001
From: Prabhu Subramanian <prabhu@appthreat.com>
Date: Tue, 21 Nov 2023 21:57:08 +0000
Subject: [PATCH] Use deep tests

Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
---
 .github/workflows/nydus-demo.yml | 10 +++++++---
 ci/Dockerfile                    |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nydus-demo.yml b/.github/workflows/nydus-demo.yml
index 2643408e3..9c5e95b36 100644
--- a/.github/workflows/nydus-demo.yml
+++ b/.github/workflows/nydus-demo.yml
@@ -54,17 +54,21 @@ jobs:
           sudo /usr/local/bin/containerd-nydus-grpc --nydusd-config /etc/nydus/nydusd-config.fusedev.json &
           sleep 15
           cd repotests/dependency-track
-          sudo nerdctl --snapshotter nydus run --rm -v $HOME/.m2:/root/.m2 -v $(pwd):/app ghcr.io/cyclonedx/cdxgen:master-nydus -p --profile research -t java /app -o /app/bom.json
+          sudo nerdctl --snapshotter nydus run --rm -e JAVA_TOOL_OPTIONS -v $HOME/.m2:$HOME/.m2 -v $(pwd):/app ghcr.io/cyclonedx/cdxgen:master-nydus --deep -t java /app -o /app/bom.json
           ls -ltr
+        env:
+          JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
       - name: cleanup
         run: |
           cd repotests/dependency-track
-          rm app.atom bom.json *.slices.json
+          rm bom.json
           sudo rm -rf /var/lib/containerd-nydus
         continue-on-error: true
       - name: dockertests
         run: |
           sleep 15
           cd repotests/dependency-track
-          sudo nerdctl run --rm -v $HOME/.m2:/root/.m2 -v $(pwd):/app ghcr.io/cyclonedx/cdxgen:master -p --profile research -t java /app -o /app/bom.json
+          sudo nerdctl run --rm -e JAVA_TOOL_OPTIONS -v $HOME/.m2:$HOME/.m2 -v $(pwd):/app ghcr.io/cyclonedx/cdxgen:master --deep -t java /app -o /app/bom.json
           ls -ltr
+        env:
+          JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
diff --git a/ci/Dockerfile b/ci/Dockerfile
index af6257fae..e5f32bafb 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -37,11 +37,15 @@ ENV GOPATH=/opt/app-root/go \
     PYTHONIOENCODING="utf-8" \
     COMPOSER_ALLOW_SUPERUSER=1 \
     ANDROID_HOME=/opt/android-sdk-linux \
+    JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
     SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
     SWIFT_PLATFORM=$SWIFT_PLATFORM \
     SWIFT_BRANCH=$SWIFT_BRANCH \
     SWIFT_VERSION=$SWIFT_VERSION \
-    SWIFT_WEBROOT=$SWIFT_WEBROOT
+    SWIFT_WEBROOT=$SWIFT_WEBROOT \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.UTF-8
 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:
 
 RUN set -e; \
@@ -61,7 +65,7 @@ RUN set -e; \
     echo -e "[nodejs]\nname=nodejs\nstream=21\nprofiles=\nstate=enabled\n" > /etc/dnf/modules.d/nodejs.module \
     && microdnf module enable php ruby -y \
     && microdnf install -y php php-curl php-zip php-bcmath php-json php-pear php-mbstring php-devel make gcc git-core \
-        python3.11 python3.11-devel python3.11-pip ruby ruby-devel \
+        python3.11 python3.11-devel python3.11-pip ruby ruby-devel glibc-common glibc-all-langpacks \
         pcre2 which tar gzip zip unzip sudo nodejs ncurses sqlite-devel \
     && alternatives --install /usr/bin/python3 python /usr/bin/python3.11 1 \
     && python3 --version \