From 0f4c6bc074b65b0307e62464c72d6a7d7e550f3e Mon Sep 17 00:00:00 2001 From: cpanato Date: Wed, 11 Nov 2020 19:27:45 +0100 Subject: [PATCH] fix git commit hash to use in the docker image --- build/Jenkinsfile.branch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/Jenkinsfile.branch b/build/Jenkinsfile.branch index e761cdd346..a4a7fbe76b 100644 --- a/build/Jenkinsfile.branch +++ b/build/Jenkinsfile.branch @@ -129,14 +129,12 @@ pipeline { sh 'docker login --username ${DOCKER_USER} --password ${DOCKER_PASS}' sh """ export TAG='${env.BRANCH_NAME}' - 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 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 """ sh """ export TAG='${env.BRANCH_NAME}' - 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 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 docker logout """