File tree Expand file tree Collapse file tree 3 files changed +11
-1
lines changed Expand file tree Collapse file tree 3 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ export PKG := github.com/operator-framework/operator-registry
9
9
export GIT_COMMIT := $(or $(SOURCE_GIT_COMMIT ) ,$(shell git rev-parse --short HEAD) )
10
10
export OPM_VERSION := $(or $(SOURCE_GIT_TAG ) ,$(shell git describe --always --tags HEAD) )
11
11
export BUILD_DATE := $(shell date -u +'% Y-% m-% dT% H:% M:% SZ')
12
+ export GRPC_HEALTH_PROBE_VERSION := $(shell $(GO ) list -m github.com/grpc-ecosystem/grpc-health-probe | awk '{print $$2}')
12
13
13
14
.DEFAULT_GOAL := all
14
15
Original file line number Diff line number Diff line change @@ -87,6 +87,7 @@ dockers:
87
87
use : buildx
88
88
build_flag_templates :
89
89
- --platform=linux/amd64
90
+ - --build-arg=GRPC_HEALTH_PROBE_VERSION={{ .Env.GRPC_HEALTH_PROBE_VERSION }}
90
91
- image_templates :
91
92
- " {{ .Env.OPM_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
92
93
ids : ["linux-arm64"]
@@ -97,6 +98,7 @@ dockers:
97
98
use : buildx
98
99
build_flag_templates :
99
100
- --platform=linux/arm64
101
+ - --build-arg=GRPC_HEALTH_PROBE_VERSION={{ .Env.GRPC_HEALTH_PROBE_VERSION }}
100
102
- image_templates :
101
103
- " {{ .Env.OPM_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
102
104
ids : ["linux-ppc64le"]
@@ -107,6 +109,7 @@ dockers:
107
109
use : buildx
108
110
build_flag_templates :
109
111
- --platform=linux/ppc64le
112
+ - --build-arg=GRPC_HEALTH_PROBE_VERSION={{ .Env.GRPC_HEALTH_PROBE_VERSION }}
110
113
- image_templates :
111
114
- " {{ .Env.OPM_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
112
115
ids : ["linux-s390x"]
@@ -117,6 +120,7 @@ dockers:
117
120
use : buildx
118
121
build_flag_templates :
119
122
- --platform=linux/s390x
123
+ - --build-arg=GRPC_HEALTH_PROBE_VERSION={{ .Env.GRPC_HEALTH_PROBE_VERSION }}
120
124
docker_manifests :
121
125
# IMAGE_TAG is either set by the Makefile or the goreleaser action workflow,
122
126
# This image is intended to be tagged/pushed on all trunk (master, release branch) commits and tags.
Original file line number Diff line number Diff line change 1
1
# NOTE: This Dockerfile is used in conjuction with GoReleaser to
2
2
# build opm images. See the configurations in .goreleaser.yaml
3
3
# and .github/workflows/release.yaml.
4
+ #
5
+ # The GRPC_HEALTH_PROBE_VERSION is automatically passed as a build arg
6
+ # by GoReleaser from the GRPC_HEALTH_PROBE_VERSION environment variable,
7
+ # which is set in the Makefile from go.mod.
4
8
5
- FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.37 AS grpc_health_probe
9
+ ARG GRPC_HEALTH_PROBE_VERSION
10
+ FROM ghcr.io/grpc-ecosystem/grpc-health-probe:${GRPC_HEALTH_PROBE_VERSION} AS grpc_health_probe
6
11
FROM gcr.io/distroless/static:debug
7
12
COPY --from=grpc_health_probe /ko-app/grpc-health-probe /bin/grpc_health_probe
8
13
COPY ["nsswitch.conf" , "/etc/nsswitch.conf" ]
You can’t perform that action at this time.
0 commit comments