Compare commits

...

5 commits

Author SHA1 Message Date
Damien Grisonnet
4ed0ddae67
Merge pull request #603 from dgrisonnet/cut-release-0.10.1
Cut release v0.10.1
2023-08-24 15:30:21 +02:00
Damien Grisonnet
5b8a28e601 Cut release v0.10.1
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
2023-08-24 15:14:57 +02:00
Damien Grisonnet
12197fda5c
Merge pull request #602 from dgrisonnet/backport-601-release-0.10
release 0.10: Fix multiarch image build
2023-08-23 16:48:18 +02:00
Damien Grisonnet
6efab90a96 pkg: fix gofmt
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
2023-08-23 15:51:28 +02:00
Damien Grisonnet
a8afe7d6d3 Fix multiarch image build
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
2023-08-23 15:32:46 +02:00
5 changed files with 6 additions and 5 deletions

View file

@ -1,3 +1,4 @@
ARG ARCH
ARG GO_VERSION ARG GO_VERSION
FROM golang:${GO_VERSION} as build FROM golang:${GO_VERSION} as build
@ -14,7 +15,7 @@ COPY Makefile Makefile
ARG ARCH ARG ARCH
RUN make prometheus-adapter 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 / COPY --from=build /go/src/sigs.k8s.io/prometheus-adapter/adapter /
USER 65534 USER 65534

View file

@ -1 +1 @@
0.10.0 0.10.1

View file

@ -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 not use this file except in compliance with the License.
You may obtain a copy of the License at 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 Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,

View file

@ -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 not use this file except in compliance with the License.
You may obtain a copy of the License at 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 Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,

View file

@ -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 not use this file except in compliance with the License.
You may obtain a copy of the License at 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 Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,