Update Jenkinsfile

Jenkinsfile

@@ -49,18 +49,22 @@ pipeline {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
-                      // def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
                       // scan the image with clair
-                      sh 'docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04'
-                      sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
+                      sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2017-10-04'
+                      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:$tag"
-                      // test the environment 
+                      // 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'
-                      // baseImg.push("$tag")
+                      baseImg.push("$tag")
 
                    }
                }