From 95b1db689e5d512250aee9986e27b3ef1aac56ec Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 14 Jan 2022 01:35:17 +0100 Subject: [PATCH] ci: final cleanup --- Jenkinsfile | 4 +--- Makefile | 2 +- trivy.html | 0 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 trivy.html diff --git a/Jenkinsfile b/Jenkinsfile index a7268f0..628a234 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,5 @@ pipeline { - // agent { node { label 'podman && trivy && aws' } } - agent { node { label 'podman' } } + agent { node { label 'podman-aws-trivy' } } stages { // Build using rootless podman stage('Build'){ @@ -12,7 +11,6 @@ pipeline { // Scan via trivy stage('Scan'){ environment { - TRIVY_TEMPLATE = "@${env.HOME}/html.tpl" TRIVY_FORMAT = "template" TRIVY_OUTPUT = "reports/trivy.html" } diff --git a/Makefile b/Makefile index 2b248ad..bb47c9c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 0.2.1 +VERSION ?= 0.2.2 BASE ?= latest-alpine-jdk11 REGISTRY := public.ecr.aws/zero-downtime REPOSITORY := jenkins-podman diff --git a/trivy.html b/trivy.html new file mode 100644 index 0000000..e69de29