Allowing for more options with branch names

ystv · Jan 6, 2024 · 9457138 · 9457138
1 parent c7ef514
commit 9457138
Showing 1 changed file with 2 additions and 99 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,8 @@
 String registryEndpoint = 'registry.comp.ystv.co.uk'
 
+def branch = env.BRANCH_NAME.replaceAll("/", "_")
 def image
-String imageName = "ystv/computing-site:${env.BRANCH_NAME}-${env.BUILD_ID}"
+String imageName = "ystv/computing-site:${branch}-${env.BUILD_ID}"
 
 pipeline {
   agent {
@@ -67,101 +68,3 @@ pipeline {
     }
   }
 }
-
-
-
-// pipeline {
-//     agent any
-//
-//     environment {
-//         REGISTRY_ENDPOINT = credentials('docker-comp-registry-endpoint')
-//     }
-//
-//     stages {
-//         stage('Update Components') {
-//             steps {
-//                 withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'comp-docker', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-//                     sh 'docker login --username $USERNAME --password $PASSWORD $REGISTRY_ENDPOINT'
-//                     sh 'docker pull golang:1.19-alpine'
-//                 }
-//             }
-//         }
-//         stage('Build') {
-//             steps {
-//                 sh 'docker build -t $REGISTRY_ENDPOINT/ystv/computing:$BUILD_ID .'
-//             }
-//         }
-//         stage('Registry Upload') {
-//             steps {
-//                 sh 'docker push $REGISTRY_ENDPOINT/ystv/computing:$BUILD_ID' // Uploaded to registry
-//             }
-//         }
-//         stage('Deploy') {
-//             stages {
-//                 stage('Staging') {
-//                     when {
-//                         branch 'master'
-//                         not {
-//                             expression { return env.TAG_NAME ==~ /v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)/ }
-//                         }
-//                     }
-//                     environment {
-//                         APP_ENV = credentials('comp-env')
-//                         TARGET_SERVER = credentials('comp-server-address')
-//                         TARGET_PATH = credentials('comp-server-path')
-//                     }
-//                     steps {
-//                         sshagent(credentials : ['comp-server-key']) {
-//                             script {
-//                                 sh 'rsync -av $APP_ENV deploy@$TARGET_SERVER:$TARGET_PATH/computing/.env'
-//                                 sh '''ssh -tt deploy@$TARGET_SERVER << EOF
-//                                     docker pull $REGISTRY_ENDPOINT/ystv/computing:$BUILD_ID
-//                                     docker rm -f ystv-computing
-//                                     docker run -d -p 7075:7075 --env-file $TARGET_PATH/computing/.env --name ystv-computing --restart=always $REGISTRY_ENDPOINT/ystv/computing:$BUILD_ID
-//                                     docker image prune -a -f --filter "label=site=computing"
-//                                     exit 0
-//                                 EOF'''
-//                             }
-//                         }
-//                     }
-//                 }
-//                 /*stage('Production') {
-//                     when {
-//                         expression { return env.TAG_NAME ==~ /v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)/ } // Checking if it is main semantic version release
-//                     }
-//                     environment {
-//                         APP_ENV = credentials('computing-env')
-//                         TARGET_SERVER = credentials('prod-server-address')
-//                         TARGET_PATH = credentials('prod-server-path')
-//                     }
-//                     steps {
-//                         sshagent(credentials : ['prod-server-key']) {
-//                             script {
-//                                 sh 'rsync -av $APP_ENV deploy@$TARGET_SERVER:$TARGET_PATH/computing/.env'
-//                                 sh '''ssh -tt deploy@$TARGET_SERVER << EOF
-//                                     docker pull $REGISTRY_ENDPOINT/ystv/computing:$BUILD_ID
-//                                     docker rm -f ystv-computing
-//                                     docker run -d -p 7075:7075 --env-file $TARGET_PATH/computing/.env --name ystv-computing --restart=always $REGISTRY_ENDPOINT/ystv/computing:$BUILD_ID
-//                                     docker image prune -a -f --filter "label=site=computing"
-//                                     exit 0
-//                                 EOF'''
-//                             }
-//                         }
-//                     }
-//                 }*/
-//             }
-//         }
-//     }
-//     post {
-//         success {
-//             echo 'Very cash-money'
-//         }
-//         failure {
-//             echo 'That is not ideal, cheeky bugger'
-//         }
-//         always {
-//             sh "docker image prune -f --filter label=site=computing --filter label=stage=builder" // Removing the local builder image
-//             sh 'docker image prune -a -f --filter "label=site=computing"' // remove old image
-//         }
-//     }
-// }