From 4bd4074a3d2214d94d0a67f67bac7a1bdc34dc8b Mon Sep 17 00:00:00 2001
From: Stefan Fleckenstein <stefan.fleckenstein@maibornwolff.de>
Date: Wed, 22 Dec 2021 22:38:23 +0100
Subject: [PATCH] Path (#20)

* set path for shell scripts

* set path for binaries in docker
---
 .gitlab-ci.yml    | 10 +++++-----
 README.md         |  4 ++--
 docker/Dockerfile |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d37883..bd63a62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 
 variables:
-  DOCKER_ARTIFACT_URL: "maibornwolff/dd-import:1.0.3"
+  DOCKER_ARTIFACT_URL: "maibornwolff/dd-import:1.0.4"
   DD_PRODUCT_TYPE_NAME: "Showcase"
   DD_PRODUCT_NAME: "DefectDojo Importer"
   DD_ENGAGEMENT_NAME: "GitLab"
@@ -89,7 +89,7 @@ upload_bandit:
     DD_TEST_TYPE_NAME: "GitLab SAST Report"
     DD_FILE_NAME: "gl-sast-report.json"
   script:
-    - /usr/local/dd-import/bin/dd-reimport-findings.sh
+    - dd-reimport-findings.sh
 
 upload_trivy:
   stage: upload
@@ -103,7 +103,7 @@ upload_trivy:
     DD_TEST_TYPE_NAME: "Trivy Scan"
     DD_FILE_NAME: "trivy.json"
   script:
-    - /usr/local/dd-import/bin/dd-reimport-findings.sh
+    - dd-reimport-findings.sh
 
 upload-dockle:
   stage: upload
@@ -123,7 +123,7 @@ upload-dockle:
     DD_COMMIT_HASH: "$CI_COMMIT_SHA"
     DD_BRANCH_TAG: "$CI_COMMIT_REF_NAME"
   script:
-    - /usr/local/dd-import/bin/dd-reimport-findings.sh
+    - dd-reimport-findings.sh
 
 upload-cloc:
   stage: upload
@@ -137,4 +137,4 @@ upload-cloc:
     GIT_STRATEGY: none
     DD_FILE_NAME: "cloc.json"
   script:
-    - /usr/local/dd-import/bin/dd-import-languages.sh
+    - dd-import-languages.sh
diff --git a/README.md b/README.md
index 66e93ab..eefd0e5 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ upload_trivy:
     DD_TEST_TYPE_NAME: "Trivy Scan"
     DD_FILE_NAME: "trivy.json"
   script:
-    - /usr/local/dd-import/bin/dd-reimport-findings.sh
+    - dd-reimport-findings.sh
 
 upload-cloc:
   image: maibornwolff/dd-import:latest
@@ -145,7 +145,7 @@ upload-cloc:
   variables:
     DD_FILE_NAME: "cloc.json"
   script:
-    - /usr/local/dd-import/bin/dd-import-languages.sh
+    - dd-import-languages.sh
 ```
 
 - ***variables*** - Definition of some environment variables that will be used for several uploads. `DD_URL` and `DD_API_KEY` are not defined here because they are protected variables for the GitLab project.
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05a0f1b..eddac7d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,5 +11,6 @@ RUN mkdir ./dd_import && mkdir ./unittests && mkdir ./bin && \
     mkdir ./coverage_data && chmod ugo+rwx ./coverage_data
 COPY --chown=ddimport:ddimport ./ ./
 RUN pip install --no-cache-dir -r requirements.txt
+ENV PATH="/usr/local/dd-import/bin:$PATH"
 
 USER ${user}