From 79d4b56eb473d096d7003eb81e125a72174d1820 Mon Sep 17 00:00:00 2001
From: Jan Fajerski <jfajersk@redhat.com>
Date: Thu, 17 Oct 2024 13:24:31 +0200
Subject: [PATCH] Dockerfile: drop double quotes around ARG default values

Afaiu the spec is unclear whether to quote this or not. In this case
here is certainly not requires and works fine without. Additionally,
there is some tooling which does not treat quotes values correctly and
generates image links like
`quay.io/prometheus/golang-builder:\"1.23\"-base`.

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
---
 Dockerfile                                | 6 +++---
 Makefile                                  | 6 +++---
 cmd/admission-webhook/Dockerfile          | 6 +++---
 cmd/prometheus-config-reloader/Dockerfile | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1d9740bbe..24bb22ce5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG ARCH="amd64"
-ARG OS="linux"
-ARG GOLANG_BUILDER="1.23"
+ARG ARCH=amd64
+ARG OS=linux
+ARG GOLANG_BUILDER=1.23
 FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder
 WORKDIR /workspace
 
diff --git a/Makefile b/Makefile
index 12db9a686..43daf1181 100644
--- a/Makefile
+++ b/Makefile
@@ -176,11 +176,11 @@ k8s-gen: $(DEEPCOPY_TARGETS) k8s-client-gen
 
 image-builder-version: .github/env
 	@echo $(GO_VERSION)
-	sed -i.bak "s/ARG GOLANG_BUILDER=.*/ARG GOLANG_BUILDER=\"$(GO_VERSION)\"/" \
+	sed -i.bak "s/ARG GOLANG_BUILDER=.*/ARG GOLANG_BUILDER=$(GO_VERSION)/" \
 		Dockerfile && rm Dockerfile.bak
-	sed -i.bak "s/ARG GOLANG_BUILDER=.*/ARG GOLANG_BUILDER=\"$(GO_VERSION)\"/" \
+	sed -i.bak "s/ARG GOLANG_BUILDER=.*/ARG GOLANG_BUILDER=$(GO_VERSION)/" \
 		cmd/prometheus-config-reloader/Dockerfile && rm cmd/prometheus-config-reloader/Dockerfile.bak
-	sed -i.bak "s/ARG GOLANG_BUILDER=.*/ARG GOLANG_BUILDER=\"$(GO_VERSION)\"/" \
+	sed -i.bak "s/ARG GOLANG_BUILDER=.*/ARG GOLANG_BUILDER=$(GO_VERSION)/" \
 		cmd/admission-webhook/Dockerfile && rm cmd/admission-webhook/Dockerfile.bak
 
 .PHONY: image
diff --git a/cmd/admission-webhook/Dockerfile b/cmd/admission-webhook/Dockerfile
index fa08fe510..ef94977c2 100644
--- a/cmd/admission-webhook/Dockerfile
+++ b/cmd/admission-webhook/Dockerfile
@@ -1,6 +1,6 @@
-ARG ARCH="amd64"
-ARG OS="linux"
-ARG GOLANG_BUILDER="1.23"
+ARG ARCH=amd64
+ARG OS=linux
+ARG GOLANG_BUILDER=1.23
 FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder
 WORKDIR /workspace
 
diff --git a/cmd/prometheus-config-reloader/Dockerfile b/cmd/prometheus-config-reloader/Dockerfile
index 5b0a78d8e..86a4a9001 100644
--- a/cmd/prometheus-config-reloader/Dockerfile
+++ b/cmd/prometheus-config-reloader/Dockerfile
@@ -1,6 +1,6 @@
-ARG ARCH="amd64"
-ARG OS="linux"
-ARG GOLANG_BUILDER="1.23"
+ARG ARCH=amd64
+ARG OS=linux
+ARG GOLANG_BUILDER=1.23
 FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base as builder
 WORKDIR /workspace