From f1b14d597447f3f0a5b5cd0bdcb86e2745d0fb09 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 17 Mar 2025 20:25:33 +0100 Subject: [PATCH] scan only for tags --- .woodpecker.yml | 15 +++++++++++++-- examples/deploy.yml | 2 +- tools/smtp-dialog.exp | 22 +++++++++++++--------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1c91c51..c87e8b1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -16,8 +16,19 @@ steps: scan_image: image: aquasec/trivy + environment: + TRIVY_TOKEN: + from_secret: trivy_token + TRIVY_URL: + from_secret: trivy_url commands: - - trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1 + - | + trivy image \ + --server $TRIVY_URL \ + --token $TRIVY_TOKEN \ + --quiet \ + --exit-code 1 \ + $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA when: - event: [push, tag] @@ -54,7 +65,7 @@ steps: -F "bom=@/tmp/sbom.xml"\ "$DTRACK_API_URL/api/v1/bom" when: - - event: [push, tag] + - event: [tag] build: image: plugins/kaniko diff --git a/examples/deploy.yml b/examples/deploy.yml index e3e1766..3100d50 100644 --- a/examples/deploy.yml +++ b/examples/deploy.yml @@ -19,7 +19,7 @@ spec: spec: containers: - name: smtp - image: quay.io/wollud1969/exim-docker:0.3.2 + image: quay.io/wollud1969/exim-docker:0.3.4 envFrom: - secretRef: name: smtp-secrets diff --git a/tools/smtp-dialog.exp b/tools/smtp-dialog.exp index 649e37a..fb324f5 100755 --- a/tools/smtp-dialog.exp +++ b/tools/smtp-dialog.exp @@ -4,13 +4,13 @@ package require base64 # SMTP-Server und Port definieren -set smtp_server "localhost" +set smtp_server "172.16.3.33" set smtp_port "25" set timeout 25 # Absender, Empfänger und Nachricht set sender $env(SMTP_SENDER) -set recipient "test@hottis.de" +set recipient $env(SMTP_RECIPIENT) set message "Subject: Test Email\r\n\r\nThis is a test email sent via an expect script." set smtp_user $env(SMTP_USER) @@ -27,17 +27,21 @@ spawn nc -C $smtp_server $smtp_port expect "220 *" # HELO/EHLO senden -send "EHLO de01rdsi01.krohnegroup.com\n" +send "EHLO baikonur\n" expect "250 *" -send "AUTH LOGIN\n" -expect "334 VXNlcm5hbWU6" +if {[info exists smtp_user] && $smtp_user ne ""} { + send "AUTH LOGIN\n" + expect "334 VXNlcm5hbWU6" -send "$smtp_user_64\n" -expect "334 UGFzc3dvcmQ6" + send "$smtp_user_64\n" + expect "334 UGFzc3dvcmQ6" -send "$smtp_pass_64\n" -expect "235 2.7.0 Authentication successful" + send "$smtp_pass_64\n" + expect "235 2.7.0 Authentication successful" +} else { + puts "skip authentication" +} # Absender definieren send "MAIL FROM:<$sender>\n"