ci: final cleanup

This commit is contained in:
Stefan Reimer 2022-01-14 01:35:17 +01:00
parent 9c16e747d7
commit 95b1db689e
3 changed files with 2 additions and 4 deletions

4
Jenkinsfile vendored
View File

@ -1,6 +1,5 @@
pipeline { pipeline {
// agent { node { label 'podman && trivy && aws' } } agent { node { label 'podman-aws-trivy' } }
agent { node { label 'podman' } }
stages { stages {
// Build using rootless podman // Build using rootless podman
stage('Build'){ stage('Build'){
@ -12,7 +11,6 @@ pipeline {
// Scan via trivy // Scan via trivy
stage('Scan'){ stage('Scan'){
environment { environment {
TRIVY_TEMPLATE = "@${env.HOME}/html.tpl"
TRIVY_FORMAT = "template" TRIVY_FORMAT = "template"
TRIVY_OUTPUT = "reports/trivy.html" TRIVY_OUTPUT = "reports/trivy.html"
} }

View File

@ -1,4 +1,4 @@
VERSION ?= 0.2.1 VERSION ?= 0.2.2
BASE ?= latest-alpine-jdk11 BASE ?= latest-alpine-jdk11
REGISTRY := public.ecr.aws/zero-downtime REGISTRY := public.ecr.aws/zero-downtime
REPOSITORY := jenkins-podman REPOSITORY := jenkins-podman

0
trivy.html Normal file
View File