Fix merge build fail on docker build 70/121670/1
authorRemigiusz Janeczek <remigiusz.janeczek@nokia.com>
Wed, 2 Jun 2021 19:15:15 +0000 (21:15 +0200)
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>
Wed, 2 Jun 2021 19:15:15 +0000 (21:15 +0200)
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

src/main/resources/Dockerfile

index 1142259..b4e54b2 100644 (file)
@@ -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}"