Merge pull request #25 from theohbrothers/fix/fix-logging-of-docker-b…

…uildx-automatic-variables Fix: Fix logging of docker buildx automatic variables
theohbrothers · Apr 21, 2023 · 3c70a50 · 3c70a50
2 parents ee99b15 + 36fafe5
commit 3c70a50
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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