Skip to content

Commit 673cfb0

Browse files
author
Jamie Curnow
committed
Updated CI
1 parent 36b014a commit 673cfb0

File tree

1 file changed

+53
-48
lines changed

1 file changed

+53
-48
lines changed

‎Jenkinsfile‎

Lines changed: 53 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,36 @@ pipeline {
1818
branch 'master'
1919
}
2020
steps {
21-
// Codebase
22-
sh 'docker pull jc21/$IMAGE_NAME-base'
23-
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base yarn --registry=$NPM_REGISTRY install'
24-
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base gulp build'
25-
sh 'rm -rf node_modules'
26-
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base yarn --registry=$NPM_REGISTRY install --prod'
27-
sh 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS node-prune'
21+
ansiColor('xterm') {
22+
// Codebase
23+
sh 'docker pull jc21/$IMAGE_NAME-base'
24+
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base yarn --registry=$NPM_REGISTRY install'
25+
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base gulp build'
26+
sh 'rm -rf node_modules'
27+
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base yarn --registry=$NPM_REGISTRY install --prod'
28+
sh 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS node-prune'
2829

29-
// Docker Build
30-
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
30+
// Docker Build
31+
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
3132

32-
// Private Registry
33-
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
34-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
35-
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
36-
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
33+
// Private Registry
34+
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
35+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
36+
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
37+
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
3738

38-
// Dockerhub
39-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
40-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
39+
// Dockerhub
40+
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
41+
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
4142

42-
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
43-
sh "docker login -u '${duser}' -p '$dpass'"
44-
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
45-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
46-
}
43+
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
44+
sh "docker login -u '${duser}' -p '$dpass'"
45+
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
46+
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
47+
}
4748

48-
sh 'docker rmi $TEMP_IMAGE_NAME'
49+
sh 'docker rmi $TEMP_IMAGE_NAME'
50+
}
4951
}
5052
}
5153
stage('armhf') {
@@ -56,46 +58,48 @@ pipeline {
5658
label 'armhf'
5759
}
5860
steps {
59-
// Codebase
60-
sh 'docker pull jc21/$IMAGE_NAME-base:armhf'
61-
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install'
62-
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf gulp build'
63-
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf rm -rf node_modules'
64-
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install --prod'
65-
sh 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS:latest-armhf node-prune'
61+
ansiColor('xterm') {
62+
// Codebase
63+
sh 'docker pull jc21/$IMAGE_NAME-base:armhf'
64+
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install'
65+
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf gulp build'
66+
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf rm -rf node_modules'
67+
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install --prod'
68+
sh 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS:latest-armhf node-prune'
6669

67-
// Docker Build
68-
sh 'docker build --pull --no-cache --squash --compress -f Dockerfile.armhf -t $TEMP_IMAGE_NAME_ARM .'
70+
// Docker Build
71+
sh 'docker build --pull --no-cache --squash --compress -f Dockerfile.armhf -t $TEMP_IMAGE_NAME_ARM .'
6972

70-
// Private Registry
71-
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
72-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
73-
sh 'docker tag $TEMP_IMAGE_NAME_ARM ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
74-
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
73+
// Private Registry
74+
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
75+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
76+
sh 'docker tag $TEMP_IMAGE_NAME_ARM ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
77+
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
7578

76-
// Dockerhub
77-
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:latest-armhf'
78-
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
79+
// Dockerhub
80+
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:latest-armhf'
81+
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
7982

80-
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
81-
sh "docker login -u '${duser}' -p '$dpass'"
82-
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf'
83-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
84-
}
83+
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
84+
sh "docker login -u '${duser}' -p '$dpass'"
85+
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf'
86+
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
87+
}
8588

86-
sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
89+
sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
90+
}
8791
}
8892
}
8993
}
9094
}
9195
}
9296
post {
9397
success {
94-
slackSend color: "#72c900", message: "SUCCESS: <${BUILD_URL}|${JOB_NAME}> build #${BUILD_NUMBER} - ${currentBuild.durationString}"
98+
juxtapose event: 'success'
9599
sh 'figlet "SUCCESS"'
96100
}
97101
failure {
98-
slackSend color: "#d61111", message: "FAILED: <${BUILD_URL}|${JOB_NAME}> build #${BUILD_NUMBER} - ${currentBuild.durationString}"
102+
juxtapose event: 'failure'
99103
sh 'figlet "FAILURE"'
100104
}
101105
}
@@ -105,3 +109,4 @@ def getPackageVersion() {
105109
ver = sh(script: 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS bash -c "cat /data/package.json|jq -r \'.version\'"', returnStdout: true)
106110
return ver.trim()
107111
}
112+

0 commit comments

Comments
 (0)