From 1a83bf731c3243bc32a121b8f8e6ec50018f74d4 Mon Sep 17 00:00:00 2001 From: Kacper Mentel Date: Tue, 10 Sep 2019 12:00:08 +0200 Subject: [PATCH 1/3] Pass a commit msg to MIM Dockerfile --- tools/circle-build-and-push-docker.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/circle-build-and-push-docker.sh b/tools/circle-build-and-push-docker.sh index f95c6b9938b..04385c813a3 100755 --- a/tools/circle-build-and-push-docker.sh +++ b/tools/circle-build-and-push-docker.sh @@ -13,6 +13,7 @@ export BUILDS=`pwd` DOCKERHUB_TAG=${CIRCLE_SHA1} VERSION=`tools/generate_vsn.sh` GIT_REF=`git rev-parse --short HEAD` +GIT_COMMIT_MSG=`git log --format=%B -n 1 HEAD` if [ -n "$CIRCLE_PULL_REQUEST" ]; then # CircleCI doesn't provide PR number in env. var., so we need to extract it from PR URL @@ -39,6 +40,7 @@ cp ../${MONGOOSE_TGZ} member docker build -f Dockerfile.member -t ${IMAGE_TAG} \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg VCS_REF=${GIT_REF} \ + --build-arg VCS_REF_DESC=${GIT_COMMIT_MSG} \ --build-arg VERSION=${VERSION} \ . From 58d0acda19bd807722d7579d660277b3b3c8fa52 Mon Sep 17 00:00:00 2001 From: Kacper Mentel Date: Tue, 10 Sep 2019 12:01:36 +0200 Subject: [PATCH 2/3] Update mongooseim-docker version --- tools/circle-build-and-push-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/circle-build-and-push-docker.sh b/tools/circle-build-and-push-docker.sh index 04385c813a3..7cd4bfbf2bf 100755 --- a/tools/circle-build-and-push-docker.sh +++ b/tools/circle-build-and-push-docker.sh @@ -33,7 +33,7 @@ IMAGE_TAG=${DOCKERHUB_REPO}/mongooseim:${DOCKERHUB_TAG} git clone https://github.com/esl/mongooseim-docker.git cd mongooseim-docker -git checkout 8105a0af3f673a92836af49ed797a16d66b51b2f +git checkout b01568e230edc86dfe8e02e80ccefe064afc3a5e cp ../${MONGOOSE_TGZ} member From 524e8ceb8252882c5f164634d71a6a55b474fc00 Mon Sep 17 00:00:00 2001 From: Kacper Mentel Date: Tue, 10 Sep 2019 16:14:07 +0200 Subject: [PATCH 3/3] Fix passing a commit msg to `docker build` command --- tools/circle-build-and-push-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/circle-build-and-push-docker.sh b/tools/circle-build-and-push-docker.sh index 7cd4bfbf2bf..89580b4ce69 100755 --- a/tools/circle-build-and-push-docker.sh +++ b/tools/circle-build-and-push-docker.sh @@ -40,7 +40,7 @@ cp ../${MONGOOSE_TGZ} member docker build -f Dockerfile.member -t ${IMAGE_TAG} \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg VCS_REF=${GIT_REF} \ - --build-arg VCS_REF_DESC=${GIT_COMMIT_MSG} \ + --build-arg VCS_REF_DESC="${GIT_COMMIT_MSG}" \ --build-arg VERSION=${VERSION} \ .