From 072738cb81bc0869dc37dcc44c57a02c3ab6f3af Mon Sep 17 00:00:00 2001 From: Jordan Keister Date: Mon, 10 Feb 2025 15:36:10 -0600 Subject: [PATCH 1/2] synch dockerfiles with grpc-health-probe version in go.mod Signed-off-by: Jordan Keister --- registry.Dockerfile | 2 +- release/goreleaser.opm.Dockerfile | 2 +- upstream-builder.Dockerfile | 2 +- upstream-opm-builder.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/registry.Dockerfile b/registry.Dockerfile index 0f3c729ec..3401502b2 100644 --- a/registry.Dockerfile +++ b/registry.Dockerfile @@ -5,7 +5,7 @@ WORKDIR /build COPY . . RUN make static -RUN GRPC_HEALTH_PROBE_VERSION=v0.4.28 && \ +RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \ wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-$(go env GOARCH) && \ chmod +x /bin/grpc_health_probe diff --git a/release/goreleaser.opm.Dockerfile b/release/goreleaser.opm.Dockerfile index 10b2cffab..fb03a5596 100644 --- a/release/goreleaser.opm.Dockerfile +++ b/release/goreleaser.opm.Dockerfile @@ -2,7 +2,7 @@ # build opm images. See the configurations in .goreleaser.yaml # and .github/workflows/release.yaml. -FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.29 as grpc_health_probe +FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.37 as grpc_health_probe FROM gcr.io/distroless/static:debug COPY --from=grpc_health_probe /ko-app/grpc-health-probe /bin/grpc_health_probe COPY ["nsswitch.conf", "/etc/nsswitch.conf"] diff --git a/upstream-builder.Dockerfile b/upstream-builder.Dockerfile index 1e1c122ae..45f63618c 100644 --- a/upstream-builder.Dockerfile +++ b/upstream-builder.Dockerfile @@ -5,7 +5,7 @@ WORKDIR /build COPY . . RUN make static -RUN GRPC_HEALTH_PROBE_VERSION=v0.4.28 && \ +RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \ wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-$(go env GOARCH) && \ chmod +x /bin/grpc_health_probe diff --git a/upstream-opm-builder.Dockerfile b/upstream-opm-builder.Dockerfile index f8c0d0755..24b908090 100644 --- a/upstream-opm-builder.Dockerfile +++ b/upstream-opm-builder.Dockerfile @@ -14,7 +14,7 @@ WORKDIR /build COPY . . RUN make static -RUN GRPC_HEALTH_PROBE_VERSION=v0.4.28 && \ +RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \ wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-$(go env GOARCH) && \ chmod +x /bin/grpc_health_probe From cb99c304d8daa76679f462dc584a50a998b139c6 Mon Sep 17 00:00:00 2001 From: Jordan Keister Date: Tue, 11 Feb 2025 15:21:47 -0600 Subject: [PATCH 2/2] review updates Signed-off-by: Jordan Keister --- registry.Dockerfile | 4 ++-- release/goreleaser.opm.Dockerfile | 2 +- upstream-builder.Dockerfile | 4 ++-- upstream-opm-builder.Dockerfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/registry.Dockerfile b/registry.Dockerfile index 3401502b2..5267a85aa 100644 --- a/registry.Dockerfile +++ b/registry.Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.23-alpine as builder +FROM golang:1.23-alpine AS builder RUN apk update && apk add sqlite build-base git mercurial bash WORKDIR /build COPY . . RUN make static -RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \ +RUN GRPC_HEALTH_PROBE_VERSION=$(go list -m github.com/grpc-ecosystem/grpc-health-probe| awk '{print $2}') && \ wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-$(go env GOARCH) && \ chmod +x /bin/grpc_health_probe diff --git a/release/goreleaser.opm.Dockerfile b/release/goreleaser.opm.Dockerfile index fb03a5596..96c70d6d2 100644 --- a/release/goreleaser.opm.Dockerfile +++ b/release/goreleaser.opm.Dockerfile @@ -2,7 +2,7 @@ # build opm images. See the configurations in .goreleaser.yaml # and .github/workflows/release.yaml. -FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.37 as grpc_health_probe +FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.37 AS grpc_health_probe FROM gcr.io/distroless/static:debug COPY --from=grpc_health_probe /ko-app/grpc-health-probe /bin/grpc_health_probe COPY ["nsswitch.conf", "/etc/nsswitch.conf"] diff --git a/upstream-builder.Dockerfile b/upstream-builder.Dockerfile index 45f63618c..3dd263fc7 100644 --- a/upstream-builder.Dockerfile +++ b/upstream-builder.Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.23-alpine as builder +FROM golang:1.23-alpine AS builder RUN apk update && apk add sqlite build-base git mercurial bash linux-headers WORKDIR /build COPY . . RUN make static -RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \ +RUN GRPC_HEALTH_PROBE_VERSION=$(go list -m github.com/grpc-ecosystem/grpc-health-probe| awk '{print $2}') && \ wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-$(go env GOARCH) && \ chmod +x /bin/grpc_health_probe diff --git a/upstream-opm-builder.Dockerfile b/upstream-opm-builder.Dockerfile index 24b908090..c2e37ae3d 100644 --- a/upstream-opm-builder.Dockerfile +++ b/upstream-opm-builder.Dockerfile @@ -14,7 +14,7 @@ WORKDIR /build COPY . . RUN make static -RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \ +RUN GRPC_HEALTH_PROBE_VERSION=$(go list -m github.com/grpc-ecosystem/grpc-health-probe| awk '{print $2}') && \ wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-$(go env GOARCH) && \ chmod +x /bin/grpc_health_probe