Skip to content

🌱 synch dockerfiles with grpc-health-probe version in go.mod #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2025
Merged

🌱 synch dockerfiles with grpc-health-probe version in go.mod #1577

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
072738c
synch dockerfiles with grpc-health-probe version in go.mod
grokspawn Feb 10, 2025
cb99c30
review updates
grokspawn Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion registry.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we maybe do something like

Suggested change
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \
RUN GRPC_HEALTH_PROBE_VERSION=$(go list -m github.com/grpc-ecosystem/grpc-health-probe | cut -d " " -f2) && \

?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and we should fix the FROM/AS case parity on line 1, i.e. FROM golang:1.23-alpine AS builder

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

Expand Down
2 changes: 1 addition & 1 deletion release/goreleaser.opm.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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"]
Expand Down
2 changes: 1 addition & 1 deletion upstream-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should fix the FROM/AS case parity in this one too
i.e. line 1 goes to FROM golang:1.23-alpine AS builder

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

Expand Down
2 changes: 1 addition & 1 deletion upstream-opm-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading