10 Commits

Author SHA1 Message Date
f55c3da3ef solve conflicting option
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-06-11 10:40:53 +02:00
f50d821aec verbose switch
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-06-11 09:59:13 +02:00
609f33b181 use correct custom ca location
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-06-11 07:40:14 +02:00
7c8e1156aa some debug
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-06-10 18:48:47 +02:00
226456ccd2 absolute pathes
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-06-10 17:18:34 +02:00
227ef294d3 custom ca, 14
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-06-04 16:14:16 +02:00
a14e0ab2c5 custom ca, 13
Some checks are pending
ci/woodpecker/tag/woodpecker Pipeline is pending
2025-06-04 16:13:14 +02:00
471fcb2177 custom ca, 12
Some checks are pending
ci/woodpecker/tag/woodpecker Pipeline is pending
2025-06-04 16:01:37 +02:00
0d4ac4022a custom ca, 11
Some checks are pending
ci/woodpecker/tag/woodpecker Pipeline is pending
2025-06-04 15:56:55 +02:00
405d66cdcb custom ca, 10
Some checks are pending
ci/woodpecker/tag/woodpecker Pipeline is pending
2025-06-04 15:53:49 +02:00
3 changed files with 16 additions and 6 deletions

View File

@ -10,6 +10,7 @@ ARG ADDITIONAL_CA_URL="x"
ARG ADDITIONAL_CA_CHECKSUM="y" ARG ADDITIONAL_CA_CHECKSUM="y"
RUN \ RUN \
set -e &&\
apk add --no-cache syft &&\ apk add --no-cache syft &&\
adduser -s /bin/sh -D user &&\ adduser -s /bin/sh -D user &&\
mkdir -p $APP_DIR &&\ mkdir -p $APP_DIR &&\
@ -17,7 +18,7 @@ RUN \
echo $ADDITIONAL_CA_URL &&\ echo $ADDITIONAL_CA_URL &&\
echo $ADDITIONAL_CA_CHECKSUM &&\ echo $ADDITIONAL_CA_CHECKSUM &&\
if [ "$ADDITIONAL_CA_URL" != "x" ]; then \ if [ "$ADDITIONAL_CA_URL" != "x" ]; then \
cd /usr/share/ca-certificates; \ cd /usr/local/share/ca-certificates; \
wget --no-check-certificate -O custom-ca.crt $ADDITIONAL_CA_URL; \ wget --no-check-certificate -O custom-ca.crt $ADDITIONAL_CA_URL; \
echo "$ADDITIONAL_CA_CHECKSUM custom-ca.crt" | md5sum -c; \ echo "$ADDITIONAL_CA_CHECKSUM custom-ca.crt" | md5sum -c; \
/usr/sbin/update-ca-certificates; \ /usr/sbin/update-ca-certificates; \

View File

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
# entrypoint.sh # entrypoint.sh
source ./.venv/bin/activate source /opt/app/.venv/bin/activate
PYTHONPATH="$PYTHONPATH:./dependencytrack-client" PYTHONPATH="$PYTHONPATH:/opt/app/dependencytrack-client"
PYTHONPATH="$PYTHONPATH:./defectdojo-client" PYTHONPATH="$PYTHONPATH:/opt/app/defectdojo-client"
export PYTHONPATH export PYTHONPATH
exec python sbom-dt-dd.py "$@" exec python /opt/app/sbom-dt-dd.py "$@"

View File

@ -16,7 +16,9 @@ class MyLocalException(Exception): pass
def executeApiCall(apiClient, ApiClass, EndpointMethod, RequestClass, requestParams, additionalParams=[]): def executeApiCall(apiClient, ApiClass, EndpointMethod, RequestClass, requestParams, additionalParams=[]):
try: try:
logger.info(f"Calling {ApiClass}.{EndpointMethod} with {RequestClass} ({additionalParams}, {requestParams})") logger.info(f"Calling {ApiClass=}.{EndpointMethod=} with {RequestClass=})")
if VERBOSE:
logger.debug(f"{additionalParams=}, {requestParams=}")
instance = ApiClass(apiClient) instance = ApiClass(apiClient)
if RequestClass: if RequestClass:
request = RequestClass(**requestParams) request = RequestClass(**requestParams)
@ -85,6 +87,11 @@ parser.add_argument('--sbomfile', '-F',
parser.add_argument('--target', '-T', parser.add_argument('--target', '-T',
help='Target to scan, either path name for sources or docker image tag', help='Target to scan, either path name for sources or docker image tag',
required=False) required=False)
parser.add_argument('--verbose', '-V',
help='A lot of debug output',
required=False,
action='store_true',
default=False)
args = parser.parse_args() args = parser.parse_args()
projectName = args.name projectName = args.name
projectVersion = args.version projectVersion = args.version
@ -98,6 +105,8 @@ if uploadSbomFlag:
else: else:
target = args.target target = args.target
VERBOSE = args.verbose
# ---- main starts here -------------------------------------------------------------------------------------------------- # ---- main starts here --------------------------------------------------------------------------------------------------