From d45c945b079aee586975b3cd01b0458fe474224c Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Tue, 31 Jul 2018 14:34:31 +1000
Subject: [PATCH] Fix CO
---
Jenkinsfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0ad0134..e30121a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,21 +62,21 @@ pipeline {
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $BASE_IMAGE_NAME:armhf yarn --registry=$NPM_REGISTRY install --prod'
// Docker Build
- sh 'docker build --pull --no-cache --squash --compress -t TEMP_IMAGE_NAME_ARM .'
+ sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME_ARM .'
// Private Registry
- sh 'docker tag TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
+ sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
// Dockerhub
- sh 'docker tag TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
+ sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
sh "docker login -u '${duser}' -p '$dpass'"
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
}
- sh 'docker rmi TEMP_IMAGE_NAME_ARM'
+ sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
}
}
}