[26.06.20] Pipeline Changes

This commit is contained in:
andrewso 2020-06-26 16:29:47 +01:00
parent 557b66fd37
commit ecab801446

View File

@ -6,9 +6,12 @@ env.GIT_BRANCH = 'master'
env.GIT_REPOSITORY_PATH = "github.com/andyjk15/${env.APPLICATION_NAME}.git" env.GIT_REPOSITORY_PATH = "github.com/andyjk15/${env.APPLICATION_NAME}.git"
env.GIT_REPOSITORY_URL = "https://${env.GIT_REPOSITORY_PATH}" env.GIT_REPOSITORY_URL = "https://${env.GIT_REPOSITORY_PATH}"
env.GITHUB_CREDENTIALS_ID = 'Github' env.GITHUB_CREDENTIALS_ID = 'Github'
env.DOCKER_REPOSITORY = 'registry.cryptosky.me' env.DIGITAL_OCEAN = 'registry.digitalocean.com'
env.DOCKER_REPOSITORY_URL = "https://${env.DOCKER_REPOSITORY}" env.DOCKER_BUILDER = 'registry.cryptosky.me'
env.DOCKER_REPOSITORY_TCP = "tcp://${env.DOCKER_REPOSITORY}:4243" env.DOCKER_REPOSITORY = "${env.DIGITAL_OCEAN}/cryptosky-image-registry"
env.DOCKER_REPOSITORY_TCP = "tcp://${env.DOCKER_BUILDER}:4243"
env.NAMESPACE = 'production' env.NAMESPACE = 'production'
env.SLAVE_LABEL = "cryptosky-aio-build" env.SLAVE_LABEL = "cryptosky-aio-build"
@ -67,18 +70,16 @@ try {
stage('Tag Repository') { stage('Tag Repository') {
withDockerServer([uri: "${env.DOCKER_REPOSITORY_TCP}"]) { withDockerServer([uri: "${env.DOCKER_REPOSITORY_TCP}"]) {
// withDockerRegistry([credentialsId: 'Registry', url: "${env.DOCKER_REPOSITORY_URL}"]) {
docker.build("${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}") docker.build("${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}")
// image.push()
docker.build("${env.APPLICATION_NAME}:latest") docker.build("${env.APPLICATION_NAME}:latest")
// latest.push()
// }
sh "docker tag ${env.APPLICATION_NAME}:${env.APPLICATION_VERSION} ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}"
sh "docker tag ${env.APPLICATION_NAME}:latest ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:latest"
sh "docker push ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}" sh "docker tag ${env.APPLICATION_NAME}:${env.APPLICATION_VERSION} ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}"
sh "docker push ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:latest" sh "docker tag ${env.APPLICATION_NAME}:latest ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:latest"
sh "docker push ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:${env.APPLICATION_VERSION}"
sh "docker push ${env.DOCKER_REPOSITORY}/${env.APPLICATION_NAME}:latest"
} }
withCredentials( withCredentials(
[usernamePassword( [usernamePassword(
credentialsId: env.GITHUB_CREDENTIALS_ID, credentialsId: env.GITHUB_CREDENTIALS_ID,