From 7f5190c5c9b885ce2f8af874faca1b39fc1b4181 Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Wed, 2 Jun 2021 21:15:15 +0200 Subject: 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 Change-Id: I1f3622df233ff22a4c312ce1055cf8029880fa09 --- src/main/resources/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}" -- cgit 1.2.3-korg