11 Commits

Author SHA1 Message Date
3bd9882beb hidden imports
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-14 16:13:18 +02:00
6004f6aeb4 add windows build step, 9
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 16:22:11 +02:00
3ffcf262e5 add windows build step, 8
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 16:17:24 +02:00
550b5ff28a add windows build step, 7
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 16:10:35 +02:00
302f4df307 add windows build step, 6
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 16:09:15 +02:00
b8f4a3c46f add windows build step, 5
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 16:07:54 +02:00
1cee3b5dae add windows build step, 4
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 16:03:20 +02:00
0d28c61c0f add windows build step, 3
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 16:01:54 +02:00
7fefc75d64 add windows build step, 2
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 15:59:48 +02:00
e0398bd8fb add windows build step
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 15:49:58 +02:00
5ff83f3af7 change artifacts
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-07-11 15:00:30 +02:00
2 changed files with 34 additions and 43 deletions

View File

@@ -1,6 +1,6 @@
stages: stages:
- generate-api-clients - generate-api-clients
- dockerize - build
variables: variables:
REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne
@@ -31,7 +31,7 @@ generate-dtrack-api:
extends: .generate-api extends: .generate-api
artifacts: artifacts:
paths: paths:
- dtrack-api-client.tgz - dependencytrack-client
expire_in: 1 week expire_in: 1 week
script: script:
- curl ${DTRACK_API_URL}/api/openapi.json > dependencytrack-openapi.json - curl ${DTRACK_API_URL}/api/openapi.json > dependencytrack-openapi.json
@@ -50,14 +50,13 @@ generate-dtrack-api:
-o dependencytrack-client \ -o dependencytrack-client \
--package-name dependencytrack_api \ --package-name dependencytrack_api \
-t dependencytrack-openapi-custom-template -t dependencytrack-openapi-custom-template
- tar -czvf dtrack-api-client.tgz dependencytrack-client
generate-defectdojo-api: generate-defectdojo-api:
extends: .generate-api extends: .generate-api
artifacts: artifacts:
paths: paths:
- defectdojo-api-client.tgz - defectdojo-client
expire_in: 1 week expire_in: 1 week
script: script:
- curl ${DEFECTDOJO_API_URL}/api/v2/oa3/schema/?format=json > defectdojo-openapi.json - curl ${DEFECTDOJO_API_URL}/api/v2/oa3/schema/?format=json > defectdojo-openapi.json
@@ -68,10 +67,9 @@ generate-defectdojo-api:
-g python \ -g python \
-o defectdojo-client \ -o defectdojo-client \
--package-name defectdojo_api --package-name defectdojo_api
- tar -czvf defectdojo-api-client.tgz defectdojo-client
dockerize: dockerize:
stage: dockerize stage: build
image: devnexus.krohne.com:18079/repository/docker-krohne/krohnedockerbash:0.5 image: devnexus.krohne.com:18079/repository/docker-krohne/krohnedockerbash:0.5
tags: tags:
- linux - linux
@@ -80,8 +78,6 @@ dockerize:
rules: rules:
- if: '$CI_COMMIT_TAG' - if: '$CI_COMMIT_TAG'
script: script:
- tar -xzf defectdojo-api-client.tgz
- tar -xzf dtrack-api-client.tgz
- docker build --build-arg ADDITIONAL_CA_URL="$KROHNE_CA_URL" - docker build --build-arg ADDITIONAL_CA_URL="$KROHNE_CA_URL"
--build-arg ADDITIONAL_CA_CHECKSUM=$KROHNE_CA_CHECKSUM --build-arg ADDITIONAL_CA_CHECKSUM=$KROHNE_CA_CHECKSUM
--tag $IMAGE_NAME:latest --tag $IMAGE_NAME:latest
@@ -93,38 +89,29 @@ dockerize:
- docker push $IMAGE_NAME:$CI_COMMIT_SHA - docker push $IMAGE_NAME:$CI_COMMIT_SHA
- docker push $IMAGE_NAME:$CI_COMMIT_TAG - docker push $IMAGE_NAME:$CI_COMMIT_TAG
build-windows-binary:
stage: build
tags:
- windows
- pwsh
- python3.13
rules:
- if: '$CI_COMMIT_TAG'
artifacts:
paths:
- sbom-dt-dd.exe
script:
- |
cd src
mv ..\dependencytrack-client .
mv ..\defectdojo-client .
& 'C:\Program Files\Python313\python.exe' -m venv venv
.\venv\Scripts\pip.exe install --upgrade pip
.\venv\Scripts\pip.exe install -r requirements.txt
.\venv\Scripts\pip.exe install -r dependencytrack-client\requirements.txt
.\venv\Scripts\pip.exe install -r defectdojo-client\requirements.txt
.\venv\Scripts\pip.exe install pyinstaller
.\venv\Scripts\pyinstaller.exe --onefile --add-data "dependencytrack-client;dependencytrack-client" --add-data "defectdojo-client;defectdojo-client" --hidden-import pydantic sbom-dt-dd.py
mv dist\sbom-dt-dd.exe ..
#
# build:
# image: plugins/kaniko
# settings:
# repo: ${FORGE_NAME}/${CI_REPO}
# registry:
# from_secret: container_registry
# tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
# username:
# from_secret: container_registry_username
# password:
# from_secret: container_registry_password
# dockerfile: Dockerfile
# when:
# - event: [ push, tag ]
#
# build-for-quay:
# image: plugins/kaniko
# settings:
# repo: quay.io/wollud1969/${CI_REPO_NAME}
# registry: quay.io
# tags:
# - latest
# - ${CI_COMMIT_TAG}
# username:
# from_secret: quay_username
# password:
# from_secret: quay_password
# dockerfile: Dockerfile
# when:
# - event: [tag]
#

View File

@@ -4,11 +4,15 @@ import argparse
import subprocess import subprocess
import json import json
import defectdojo_api
from defectdojo_api.rest import ApiException as DefectDojoApiException
import datetime import datetime
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'defectdojo-client'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'dependencytrack-client'))
import defectdojo_api
from defectdojo_api.rest import ApiException as DefectDojoApiException
import dependencytrack_api import dependencytrack_api
from dependencytrack_api.rest import ApiException as DependencyTrackApiException from dependencytrack_api.rest import ApiException as DependencyTrackApiException