From d4f0011eb89831b3e9b92c57bb30ff002cedce41 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 18 Feb 2020 09:30:59 -0500
Subject: [PATCH] Update Jenkinsfile
---
Jenkinsfile | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 181d2255..678a2148 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,8 +52,7 @@ pipeline {
script {
try{
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
- // baseImg = docker.build("$maintainer/$imagename", "--build-arg GROUPER_CONTAINER_VERSION=$tag --no-cache .")
- baseImg = docker.build("$maintainer/$imagename", "--build-arg GROUPER_CONTAINER_VERSION=$tag .")
+ baseImg = docker.build("$maintainer/$imagename", "--build-arg GROUPER_CONTAINER_VERSION=$tag --no-cache .")
}
} catch(error) {
def error_details = readFile('./debug');
@@ -82,21 +81,7 @@ pipeline {
stage('Push') {
steps {
script {
- //// scan the image with clair
- // sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
- // sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
- // sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
- // sh 'chmod 755 clair-scanner'
- // sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
- //// test the environment
- // sh 'docker kill clairdb'
- // sh 'docker rm clairdb'
- // sh 'docker kill clair'
- // sh 'docker rm clair'
- // sh 'cd test-compose && ./compose.sh'
- //// bring down after testing
- //sh 'cd test-compose && docker-compose down'
- docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
+ docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
baseImg.push("$tag")
}
}