From 36fafe5f3026c7da5cfb13f16bf1cae79eeac4f7 Mon Sep 17 00:00:00 2001
From: Leonard Jonathan Oh <leonardjonathanoh@live.com>
Date: Fri, 21 Apr 2023 19:23:20 +0000
Subject: [PATCH] Fix: Fix logging of docker buildx automatic variables

---
 generate/templates/Dockerfile.ps1       | 16 ++++++++--------
 variants/1.4.4-pingme/Dockerfile        | 16 ++++++++--------
 variants/1.4.4-restic-pingme/Dockerfile | 16 ++++++++--------
 variants/1.4.4-restic/Dockerfile        | 16 ++++++++--------
 variants/1.4.4/Dockerfile               | 16 ++++++++--------
 5 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
index 7e467d4..c987e1c 100644
--- a/generate/templates/Dockerfile.ps1
+++ b/generate/templates/Dockerfile.ps1
@@ -174,14 +174,14 @@ ARG BUILDOS
 ARG BUILDARCH
 ARG BUILDVARIANT
 RUN set -eu; \
-    echo "TARGETPLATFORM=$TARGETPLATFORM"; \
-    echo "TARGETOS=$TARGETOS"; \
-    echo "TARGETARCH=$TARGETARCH"; \
-    echo "TARGETVARIANT=$TARGETVARIANT"; \
-    echo "BUILDPLATFORM=$BUILDPLATFORM"; \
-    echo "BUILDOS=$BUILDOS"; \
-    echo "BUILDARCH=$BUILDARCH"; \
-    echo "BUILDVARIANT=$BUILDVARIANT";
+    echo "TARGETPLATFORM=`$TARGETPLATFORM"; \
+    echo "TARGETOS=`$TARGETOS"; \
+    echo "TARGETARCH=`$TARGETARCH"; \
+    echo "TARGETVARIANT=`$TARGETVARIANT"; \
+    echo "BUILDPLATFORM=`$BUILDPLATFORM"; \
+    echo "BUILDOS=`$BUILDOS"; \
+    echo "BUILDARCH=`$BUILDARCH"; \
+    echo "BUILDVARIANT=`$BUILDVARIANT";
 
 # Install isync
 RUN apk add --no-cache ca-certificates
diff --git a/variants/1.4.4-pingme/Dockerfile b/variants/1.4.4-pingme/Dockerfile
index dd75dbb..4150b4e 100644
--- a/variants/1.4.4-pingme/Dockerfile
+++ b/variants/1.4.4-pingme/Dockerfile
@@ -9,14 +9,14 @@ ARG BUILDOS
 ARG BUILDARCH
 ARG BUILDVARIANT
 RUN set -eu; \
-    echo "TARGETPLATFORM="; \
-    echo "TARGETOS="; \
-    echo "TARGETARCH="; \
-    echo "TARGETVARIANT="; \
-    echo "BUILDPLATFORM="; \
-    echo "BUILDOS="; \
-    echo "BUILDARCH="; \
-    echo "BUILDVARIANT=";
+    echo "TARGETPLATFORM=$TARGETPLATFORM"; \
+    echo "TARGETOS=$TARGETOS"; \
+    echo "TARGETARCH=$TARGETARCH"; \
+    echo "TARGETVARIANT=$TARGETVARIANT"; \
+    echo "BUILDPLATFORM=$BUILDPLATFORM"; \
+    echo "BUILDOS=$BUILDOS"; \
+    echo "BUILDARCH=$BUILDARCH"; \
+    echo "BUILDVARIANT=$BUILDVARIANT";
 
 # Install isync
 RUN apk add --no-cache ca-certificates
diff --git a/variants/1.4.4-restic-pingme/Dockerfile b/variants/1.4.4-restic-pingme/Dockerfile
index cbab78c..0b895a3 100644
--- a/variants/1.4.4-restic-pingme/Dockerfile
+++ b/variants/1.4.4-restic-pingme/Dockerfile
@@ -9,14 +9,14 @@ ARG BUILDOS
 ARG BUILDARCH
 ARG BUILDVARIANT
 RUN set -eu; \
-    echo "TARGETPLATFORM="; \
-    echo "TARGETOS="; \
-    echo "TARGETARCH="; \
-    echo "TARGETVARIANT="; \
-    echo "BUILDPLATFORM="; \
-    echo "BUILDOS="; \
-    echo "BUILDARCH="; \
-    echo "BUILDVARIANT=";
+    echo "TARGETPLATFORM=$TARGETPLATFORM"; \
+    echo "TARGETOS=$TARGETOS"; \
+    echo "TARGETARCH=$TARGETARCH"; \
+    echo "TARGETVARIANT=$TARGETVARIANT"; \
+    echo "BUILDPLATFORM=$BUILDPLATFORM"; \
+    echo "BUILDOS=$BUILDOS"; \
+    echo "BUILDARCH=$BUILDARCH"; \
+    echo "BUILDVARIANT=$BUILDVARIANT";
 
 # Install isync
 RUN apk add --no-cache ca-certificates
diff --git a/variants/1.4.4-restic/Dockerfile b/variants/1.4.4-restic/Dockerfile
index 2d1c963..e021aac 100644
--- a/variants/1.4.4-restic/Dockerfile
+++ b/variants/1.4.4-restic/Dockerfile
@@ -9,14 +9,14 @@ ARG BUILDOS
 ARG BUILDARCH
 ARG BUILDVARIANT
 RUN set -eu; \
-    echo "TARGETPLATFORM="; \
-    echo "TARGETOS="; \
-    echo "TARGETARCH="; \
-    echo "TARGETVARIANT="; \
-    echo "BUILDPLATFORM="; \
-    echo "BUILDOS="; \
-    echo "BUILDARCH="; \
-    echo "BUILDVARIANT=";
+    echo "TARGETPLATFORM=$TARGETPLATFORM"; \
+    echo "TARGETOS=$TARGETOS"; \
+    echo "TARGETARCH=$TARGETARCH"; \
+    echo "TARGETVARIANT=$TARGETVARIANT"; \
+    echo "BUILDPLATFORM=$BUILDPLATFORM"; \
+    echo "BUILDOS=$BUILDOS"; \
+    echo "BUILDARCH=$BUILDARCH"; \
+    echo "BUILDVARIANT=$BUILDVARIANT";
 
 # Install isync
 RUN apk add --no-cache ca-certificates
diff --git a/variants/1.4.4/Dockerfile b/variants/1.4.4/Dockerfile
index 829e150..86e4ade 100644
--- a/variants/1.4.4/Dockerfile
+++ b/variants/1.4.4/Dockerfile
@@ -9,14 +9,14 @@ ARG BUILDOS
 ARG BUILDARCH
 ARG BUILDVARIANT
 RUN set -eu; \
-    echo "TARGETPLATFORM="; \
-    echo "TARGETOS="; \
-    echo "TARGETARCH="; \
-    echo "TARGETVARIANT="; \
-    echo "BUILDPLATFORM="; \
-    echo "BUILDOS="; \
-    echo "BUILDARCH="; \
-    echo "BUILDVARIANT=";
+    echo "TARGETPLATFORM=$TARGETPLATFORM"; \
+    echo "TARGETOS=$TARGETOS"; \
+    echo "TARGETARCH=$TARGETARCH"; \
+    echo "TARGETVARIANT=$TARGETVARIANT"; \
+    echo "BUILDPLATFORM=$BUILDPLATFORM"; \
+    echo "BUILDOS=$BUILDOS"; \
+    echo "BUILDARCH=$BUILDARCH"; \
+    echo "BUILDVARIANT=$BUILDVARIANT";
 
 # Install isync
 RUN apk add --no-cache ca-certificates