Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Commit

Permalink
Path (#20)
Browse files Browse the repository at this point in the history
* set path for shell scripts

* set path for binaries in docker
  • Loading branch information
StefanFl authored Dec 22, 2021
1 parent c61700a commit 4bd4074
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

0 comments on commit 4bd4074

Please sign in to comment.