From a8afe7d6d3fc5c8284a6c7eb3f891ae407ed621e Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Tue, 22 Aug 2023 18:01:46 +0200 Subject: [PATCH 1/2] Fix multiarch image build Signed-off-by: Damien Grisonnet --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 378d25ed..0140d73c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ +ARG ARCH ARG GO_VERSION FROM golang:${GO_VERSION} as build @@ -14,7 +15,7 @@ COPY Makefile Makefile ARG ARCH RUN make prometheus-adapter -FROM gcr.io/distroless/static:latest +FROM gcr.io/distroless/static:latest-$ARCH COPY --from=build /go/src/sigs.k8s.io/prometheus-adapter/adapter / USER 65534 From 6efab90a966d10288845174cd31bc13bb1c84b99 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Wed, 23 Aug 2023 15:51:28 +0200 Subject: [PATCH 2/2] pkg: fix gofmt Signed-off-by: Damien Grisonnet --- pkg/client/helpers.go | 2 +- pkg/client/interfaces.go | 2 +- pkg/client/metrics/metrics.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/client/helpers.go b/pkg/client/helpers.go index 34544f9f..754efe51 100644 --- a/pkg/client/helpers.go +++ b/pkg/client/helpers.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pkg/client/interfaces.go b/pkg/client/interfaces.go index cf3cbe04..bb0242ac 100644 --- a/pkg/client/interfaces.go +++ b/pkg/client/interfaces.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pkg/client/metrics/metrics.go b/pkg/client/metrics/metrics.go index bbebf43a..f5725664 100644 --- a/pkg/client/metrics/metrics.go +++ b/pkg/client/metrics/metrics.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,