Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions components/api-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:fe0672d0b4bf43b502fe7ab4f251c266b558346cd3b8892c7c79b3b5f2c3a92f AS builder
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:aef155087940a9221c59ca48ad8af371a4c1a46b05f0283737149cb00ef484b3 AS builder

WORKDIR /workspace

Expand All @@ -17,7 +17,7 @@ RUN CGO_ENABLED=0 go build -mod=mod -ldflags="-s -w \
-X 'github.com/openshift-online/hypershell/components/api-server/pkg/api.BuildTime=${BUILD_TIME}'" \
-o hypershell ./cmd/hypershell

FROM registry.access.redhat.com/hi/go:1.26.5@sha256:55d95d0bd29598f821931dec7155efd331068bdd84162d7d4b2e7ad66ec6c124
FROM registry.access.redhat.com/hi/go:1.26.5@sha256:eb29e565caf76cf408a77a73548a3ed62e00e3516c17d02d5f36838aea69a605

COPY --from=builder --chown=1001:0 /workspace/hypershell /usr/local/bin/

Expand Down
4 changes: 2 additions & 2 deletions components/api-server/Dockerfile.openapi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:fe0672d0b4bf43b502fe7ab4f251c266b558346cd3b8892c7c79b3b5f2c3a92f AS go-toolchain
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:aef155087940a9221c59ca48ad8af371a4c1a46b05f0283737149cb00ef484b3 AS go-toolchain

FROM openapitools/openapi-generator-cli:v7.16.0@sha256:e56372add5e038753fb91aa1bbb470724ef58382fdfc35082bf1b3e079ce353c
FROM openapitools/openapi-generator-cli:v7.24.0@sha256:5bf3dc75f764c584da8e3344c51b2f3f1e74703461d46a035b5ac1d31515cc88

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

[Major] Regenerate the committed SDK for this generator bump. Bumping openapi-generator-cli v7.16.0 -> v7.24.0 changes the tool that produces components/api-server/pkg/api/openapi. That directory's .openapi-generator/VERSION still says 7.16.0, and make generate (which rm -rf pkg/api/openapi then copies the container output back) will rewrite it to 7.24.0. .github/workflows/sdk-drift-check.yml runs make generate generate-sdk on any Dockerfile.openapi change and fails on drift, so this bump will fail CI until the SDK is regenerated. Run cd components/api-server && make generate generate-sdk, commit, and review the regenerated diff for behavioral changes before merge.


COPY --from=go-toolchain /usr/lib/golang/bin/gofmt /usr/local/bin/gofmt

Expand Down
4 changes: 2 additions & 2 deletions components/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:fe0672d0b4bf43b502fe7ab4f251c266b558346cd3b8892c7c79b3b5f2c3a92f AS builder
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:aef155087940a9221c59ca48ad8af371a4c1a46b05f0283737149cb00ef484b3 AS builder

WORKDIR /workspace

Expand All @@ -10,7 +10,7 @@ COPY pkg/ pkg/

RUN CGO_ENABLED=0 go build -ldflags="-s -w" -o hypershell ./cmd/hypershell

FROM registry.access.redhat.com/hi/go:1.26.5@sha256:55d95d0bd29598f821931dec7155efd331068bdd84162d7d4b2e7ad66ec6c124
FROM registry.access.redhat.com/hi/go:1.26.5@sha256:eb29e565caf76cf408a77a73548a3ed62e00e3516c17d02d5f36838aea69a605

COPY --from=builder --chown=1001:0 /workspace/hypershell /usr/local/bin/

Expand Down
4 changes: 2 additions & 2 deletions components/control-plane/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:fe0672d0b4bf43b502fe7ab4f251c266b558346cd3b8892c7c79b3b5f2c3a92f AS builder
FROM registry.access.redhat.com/hi/go:1.26.5-builder@sha256:aef155087940a9221c59ca48ad8af371a4c1a46b05f0283737149cb00ef484b3 AS builder

WORKDIR /workspace

Expand All @@ -17,7 +17,7 @@ COPY components/control-plane/internal/ components/control-plane/internal/

RUN cd components/control-plane && CGO_ENABLED=0 go build -mod=mod -ldflags="-s -w" -o /workspace/hypershell-controller ./cmd/hypershell-controller

FROM registry.access.redhat.com/hi/go:1.26.5@sha256:55d95d0bd29598f821931dec7155efd331068bdd84162d7d4b2e7ad66ec6c124
FROM registry.access.redhat.com/hi/go:1.26.5@sha256:eb29e565caf76cf408a77a73548a3ed62e00e3516c17d02d5f36838aea69a605

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

[Major] This line no longer exists on main. Current main uses registry.access.redhat.com/hi/static:1787099997@sha256:f4d5109b... (distroless static) for the control-plane runtime, not hi/go:1.26.5. This branch is based on stale main, so this hunk is obsolete; if resolved naively during rebase it would revert the hi/static migration. Rebase onto current main and re-review to confirm the distroless runtime is preserved.


COPY --from=builder --chown=1001:0 /workspace/hypershell-controller /usr/local/bin/
COPY --chown=1001:0 components/control-plane/manifests/ /manifests/
Expand Down
4 changes: 2 additions & 2 deletions components/web-console/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/hi/nodejs:24.18.1-builder@sha256:63f3ae9ba3ac4af3c809d58c0845effbfbb75a6f2e08148af8ae2e95d889132f AS build
FROM registry.access.redhat.com/hi/nodejs:24.18.1-builder@sha256:41ec0465a1e00e55e2c4e82c322a71906a9e00c57251efabc18848177c49161e AS build

USER 0

Expand Down Expand Up @@ -30,7 +30,7 @@ RUN pnpm install --frozen-lockfile --offline \
&& pnpm --filter @openshift-online/hypershell-web-console-bff deploy --prod /tmp/web-console \
&& cp -R components/web-console/build/client /tmp/web-console/public

FROM registry.access.redhat.com/hi/nodejs:24.18.1@sha256:b24c3fce1b2803aa622d1bd7add354d0974528fdf1f16f1303226bfa5e3c6666
FROM registry.access.redhat.com/hi/nodejs:24.18.1@sha256:24bd0d73317d0da304af77ae6bc58c49a2bea40b2a40575d83c9d82c4d7c2f29

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

[Major] Stale digest relative to main. main already pins the Node.js runtime at sha256:07b0f6cf... (and the builder at sha256:e2a04f74...), both newer than the value this PR sets. Merging this hunk would downgrade Node.js. Rebase onto current main so Renovate re-derives the correct digests.


LABEL org.opencontainers.image.title="HyperShell web console" \
org.opencontainers.image.description="HyperShell web console BFF and static application" \
Expand Down
Loading