diff --git a/build/Jenkinsfile.branch b/build/Jenkinsfile.branch index 88b8cba34b..286e9a71ad 100644 --- a/build/Jenkinsfile.branch +++ b/build/Jenkinsfile.branch @@ -128,16 +128,16 @@ pipeline { withCredentials([usernamePassword(credentialsId: 'matterbuild-docker-hub', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS')]) { sh 'docker login --username ${DOCKER_USER} --password ${DOCKER_PASS}' sh """ - export GIT_COMMIT=$(git rev-parse --short HEAD) export TAG='${env.BRANCH_NAME}' - docker build --no-cache --build-arg MM_PACKAGE=https://releases.mattermost.com/mattermost-platform/${env.BRANCH_NAME}/mattermost-enterprise-linux-amd64.tar.gz -t mattermost/mattermost-enterprise-edition:\${TAG} -t mattermost/mattermost-enterprise-edition:\${GIT_COMMIT} build - docker push mattermost/mattermost-enterprise-edition:\${TAG} mattermost/mattermost-enterprise-edition:\${GIT_COMMIT} + export GIT_HASH=\$(git rev-parse --short HEAD) + docker build --no-cache --build-arg MM_PACKAGE=https://releases.mattermost.com/mattermost-platform/${env.BRANCH_NAME}/mattermost-enterprise-linux-amd64.tar.gz -t mattermost/mattermost-enterprise-edition:\${TAG} -t mattermost/mattermost-enterprise-edition:\${GIT_HASH} build + docker push mattermost/mattermost-enterprise-edition:\${TAG} mattermost/mattermost-enterprise-edition:\${GIT_HASH} """ sh """ - export GIT_COMMIT=$(git rev-parse --short HEAD) export TAG='${env.BRANCH_NAME}' - docker build --no-cache --build-arg MM_PACKAGE=https://releases.mattermost.com/mattermost-platform/${env.BRANCH_NAME}/mattermost-team-linux-amd64.tar.gz -t mattermost/mattermost-team-edition:\${TAG} -t mattermost/mattermost-team-edition:\${GIT_COMMIT} build - docker push mattermost/mattermost-team-edition:\${TAG} mattermost/mattermost-team-edition:\${GIT_COMMIT} + export GIT_HASH=\$(git rev-parse --short HEAD) + docker build --no-cache --build-arg MM_PACKAGE=https://releases.mattermost.com/mattermost-platform/${env.BRANCH_NAME}/mattermost-team-linux-amd64.tar.gz -t mattermost/mattermost-team-edition:\${TAG} -t mattermost/mattermost-team-edition:\${GIT_HASH} build + docker push mattermost/mattermost-team-edition:\${TAG} mattermost/mattermost-team-edition:\${GIT_HASH} docker logout """ }