Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
f50d821aec
|
|||
609f33b181
|
|||
7c8e1156aa
|
|||
226456ccd2
|
@ -18,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; \
|
||||||
|
@ -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 "$@"
|
||||||
|
|
||||||
|
@ -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 --------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user