summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2021-06-02 21:15:15 +0200
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2021-06-02 21:15:15 +0200
commit7f5190c5c9b885ce2f8af874faca1b39fc1b4181 (patch)
tree6f28ae4079d59085d0480dbb7e144528e4802ea1
parentc83f2b4cbaee744a1d77f83db0bbd093ed2dadf2 (diff)
Fix merge build fail on docker build
Docker build was failing on git.commit.message.short label when commit message included double quote mark, which happens when auto-merging commits. Quotes around ${git.commit.message.short} were changed to single quote marks as those are used less frequently. Issue-ID: DCAEGEN2-2824 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: I1f3622df233ff22a4c312ce1055cf8029880fa09
-rw-r--r--src/main/resources/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile
index 1142259..b4e54b2 100644
--- a/src/main/resources/Dockerfile
+++ b/src/main/resources/Dockerfile
@@ -49,7 +49,7 @@ LABEL git.branch="${git.branch}" \
git.build.version="${git.build.version}" \
git.closest.tag.name="${git.closest.tag.name}" \
git.commit.id="${git.commit.id}" \
- git.commit.message.short="${git.commit.message.short}" \
+ git.commit.message.short='${git.commit.message.short}' \
git.commit.time="${git.commit.time}" \
git.commit.user.email="${git.commit.user.email}" \
git.commit.user.name="${git.commit.user.name}"