Make Tern + Scancode work together #1827

mercedes-benz · Jul 18, 2023 · 9a7c833 · 9a7c833
1 parent b421a56
commit 9a7c833
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 92 deletions.
diff --git a/sechub-pds-solutions/tern/01-start-single-docker-compose.sh b/sechub-pds-solutions/tern/01-start-single-docker-compose.sh
@@ -9,7 +9,7 @@ ENVIRONMENT_FILE=".env-single"
 
 # Only variables from .env can be used in the Docker-Compose file
 # all other variables are only available in the container
-setup_environment_file ".env" "env"
+setup_environment_file ".env" "env" "$ENVIRONMENT_FILES_FOLDER/env-base-image"
 setup_environment_file "$ENVIRONMENT_FILE" "$ENVIRONMENT_FILES_FOLDER/env-base"
 
 # Use Docker BuildKit

diff --git a/sechub-pds-solutions/tern/05-start-single-sechub-network-docker-compose.sh b/sechub-pds-solutions/tern/05-start-single-sechub-network-docker-compose.sh
@@ -9,7 +9,7 @@ ENVIRONMENT_FILE=".env-single"
 
 # Only variables from .env can be used in the Docker-Compose file
 # all other variables are only available in the container
-setup_environment_file ".env" "env"
+setup_environment_file ".env" "env" "$ENVIRONMENT_FILES_FOLDER/env-base-image"
 setup_environment_file "$ENVIRONMENT_FILE" "$ENVIRONMENT_FILES_FOLDER/env-base"
 
 # Use Docker BuildKit

diff --git a/sechub-pds-solutions/tern/docker/Tern-Debian.dockerfile b/sechub-pds-solutions/tern/docker/Tern-Debian.dockerfile
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.title="SecHub Tern+PDS Image"
 LABEL org.opencontainers.image.description="A container which combines Tern with the SecHub Product Delegation Server (PDS)"
 LABEL maintainer="SecHub FOSS Team"
 
-ARG TERN_VERSION="2.12.0"
+ARG TERN_VERSION="2.12.1"
 ARG SCANCODE_VERSION="32.0.4"
 
 # execute commands as root

diff --git a/sechub-pds-solutions/tern/docker/requirements.txt b/sechub-pds-solutions/tern/docker/requirements.txt
diff --git a/sechub-pds-solutions/tern/env b/sechub-pds-solutions/tern/env
@@ -1,7 +1,5 @@
-# The base image to use
-# uncomment to use local image
-# BASE_IMAGE="pds-base_pds"
-BASE_IMAGE="ghcr.io/mercedes-benz/sechub/pds-base"
-
 # See: https://github.com/tern-tools/tern/releases
-TERN_VERSION="2.12.0"
+TERN_VERSION="2.12.1"
+
+# See: https://github.com/nexB/scancode-toolkit/releases
+SCANCODE_VERSION="32.0.4"
diff --git a/sechub-pds-solutions/tern/tests/run-suite.sh b/sechub-pds-solutions/tern/tests/run-suite.sh
@@ -34,7 +34,7 @@ then
     do
         create_build_folder
         run_test "sechub-test-$test_case" "${test_cases[$test_case]}"
-        remove_build_folder 
+        #remove_build_folder 
     done
 else
     log_error "Unable to connect to PDS Tern."

diff --git a/sechub-pds-solutions/tern/tests/test-tern.sh b/sechub-pds-solutions/tern/tests/test-tern.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: MIT
 
-BUILD_FOLDER="build/"
+BUILD_FOLDER="build"
 TOOLS="tools/"
 PDS_TOOLS_CLI_VERSION="0.1.0"
 PDS_API='../../../sechub-developertools/scripts/pds-api.sh'