Update Jenkinsfile

bkatiemills · web-flow · commit d9227d953043 · 2020-01-30T16:19:51.000-05:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -14,11 +14,12 @@ pipeline {
         stage('Build') {
             environment {
                 DTR_ACCESS_KEY = credentials('jenkins-dtr-access-token')
+		MAJORMINOR = '0.0'
             }
             steps {
-                sh 'docker image build -t ${DTR_FQDN_PORT}/engineering/api-build:rc-1.0-build-${BUILD_ID} api'
+		    sh 'docker image build -t ${DTR_FQDN_PORT}/engineering/api-build:rc-${MAJORMINOR}.${BUILD_ID} api'
                 sh 'docker login -u jenkins -p ${DTR_ACCESS_KEY} ${DTR_FQDN_PORT}'
-                sh 'docker image push ${DTR_FQDN_PORT}/engineering/api-build:rc-1.0-build-${BUILD_ID}'
+                sh 'docker image push ${DTR_FQDN_PORT}/engineering/api-build:rc-${MAJORMINOR}.${BUILD_ID}'
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,12 @@ pipeline {`
`14`	`14`	`stage('Build') {`
`15`	`15`	`environment {`
`16`	`16`	`DTR_ACCESS_KEY = credentials('jenkins-dtr-access-token')`
	`17`	`+ MAJORMINOR = '0.0'`
`17`	`18`	`}`
`18`	`19`	`steps {`
`19`		`- sh 'docker image build -t ${DTR_FQDN_PORT}/engineering/api-build:rc-1.0-build-${BUILD_ID} api'`
	`20`	`+ sh 'docker image build -t ${DTR_FQDN_PORT}/engineering/api-build:rc-${MAJORMINOR}.${BUILD_ID} api'`
`20`	`21`	`sh 'docker login -u jenkins -p ${DTR_ACCESS_KEY} ${DTR_FQDN_PORT}'`
`21`		`- sh 'docker image push ${DTR_FQDN_PORT}/engineering/api-build:rc-1.0-build-${BUILD_ID}'`
	`22`	`+ sh 'docker image push ${DTR_FQDN_PORT}/engineering/api-build:rc-${MAJORMINOR}.${BUILD_ID}'`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`}`