merged

.woodpecker.yml

@@ -13,6 +13,42 @@ steps:
       dockerfile: Dockerfile
     when:
       - event: [push, tag]
+        
+  scan:
+    image: quay.io/wollud1969/woodpecker-helper:0.5.1
+    environment:
+      TRIVY_TOKEN:
+        from_secret: trivy_token
+      TRIVY_URL:
+        from_secret: trivy_url
+      DTRACK_API_KEY:
+        from_secret: dtrack_api_key
+      DTRACK_API_URL:
+        from_secret: dtrack_api_url
+    commands:
+      - HOME=/home/`id -nu`
+      - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}"
+      - |
+        trivy image \
+              --server $TRIVY_URL \
+              --token $TRIVY_TOKEN \
+              --format cyclonedx \
+              --scanners license \
+              --output /tmp/sbom.xml \
+              $FORGE_NAME/$CI_REPO:$TAG
+      - cat /tmp/sbom.xml
+      - |
+        curl -X "POST" \
+             -H "Content-Type: multipart/form-data" \
+             -H "X-Api-Key: $DTRACK_API_KEY" \
+             -F "autoCreate=true" \
+             -F "projectName=$CI_REPO" \
+             -F "projectVersion=$TAG" \
+             -F "bom=@/tmp/sbom.xml"\
+             "$DTRACK_API_URL/api/v1/bom"        
+    when:
+      - event: [push, tag]
+
   deploy:
     image: quay.io/wollud1969/k8s-admin-helper:0.2.1
     environment:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-alpine3.21
+FROM python:3.11-alpine3.21
 
 ENV REDIS_URL=""
 ENV SECRET_KEY=""

src/requirements.txt

@@ -16,7 +16,7 @@ idna==3.10
 importlib_metadata==8.6.1
 itsdangerous==2.2.0
 Jinja2==3.1.5
-kaleido==1.0.0rc0
+kaleido==0.2.1
 loguru==0.7.3
 MarkupSafe==3.0.2
 msgspec==0.19.0

src/run.py

@@ -1,7 +1,6 @@
 from flask import Flask, session, g, render_template_string, Response
 from flask_session import Session
 from flask_oidc import OpenIDConnect
-import kaleido
 from werkzeug.middleware.proxy_fix import ProxyFix
 from loguru import logger
 import redis
@@ -162,7 +161,7 @@ def ntpserver():
           select   time_bucket('5 minutes', time) as bucket,
             device,
             avg(cast(values->'rootdisp'->>'value'  as float)) as rootdisp,
-            avg(cast(values->'stratum'->>'value'  as int)) as stratum
+            max(cast(values->'stratum'->>'value'  as int)) as stratum
           from measurements
           where time >= date_trunc('day', now()) AND time < date_trunc('day', now()) + '1 day'::interval and 
             application = 'TSM' and attributes->>'Label' = 'david'
@@ -209,7 +208,7 @@ def ntpserver():
 
 
 if __name__ == '__main__':
-    app.run(port=8080)
+    app.run(host="0.0.0.0", port=8080)
 else:
     exposed_app = ProxyFix(app, x_for=1, x_host=1)