mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-14 00:06:30 +00:00
Code Activity

Dockerfile: drop double quotes around ARG default values

Browse source 
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>
This commit is contained in:
Jan Fajerski 2024-10-17 13:24:31 +02:00
parent 5265599f58
commit 79d4b56eb4
4 changed files with 12 additions and 12 deletions
DockerfileMakefile
cmd
admission-webhook
Dockerfile
prometheus-config-reloader
Dockerfile

6
Dockerfile
View file

@ -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

6
Makefile
View file

@ -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

6
cmd/admission-webhook/Dockerfile
View file

@ -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

6
cmd/prometheus-config-reloader/Dockerfile
View file

@ -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