Skip to content
Merged
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
2 changes: 1 addition & 1 deletion openshift/ci-operator/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools

# Dockerfile to bootstrap build and test in openshift-ci
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.16 as builder
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder

ARG TARGETARCH

Expand Down
4 changes: 3 additions & 1 deletion openshift/ci-operator/knative-images/eventmesh/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# DO NOT EDIT! Generated Dockerfile for backends/cmd/eventmesh.
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.16
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

FROM $GO_BUILDER as builder

WORKDIR /workspace
COPY . .

ENV CGO_ENABLED=1
Expand All @@ -16,6 +17,7 @@ FROM $GO_RUNTIME
ARG VERSION=knative-v1.16

COPY --from=builder /usr/bin/main /usr/bin/eventmesh
COPY LICENSE /licenses/

USER 65532

Expand Down
4 changes: 3 additions & 1 deletion openshift/ci-operator/knative-images/migrate/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/pkg/apiextensions/storageversion/cmd/migrate.
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.16
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

FROM $GO_BUILDER as builder

WORKDIR /workspace
COPY . .

ENV CGO_ENABLED=1
Expand All @@ -16,6 +17,7 @@ FROM $GO_RUNTIME
ARG VERSION=knative-v1.16

COPY --from=builder /usr/bin/main /usr/bin/migrate
COPY LICENSE /licenses/

USER 65532

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/reconciler-test/cmd/eventshub.
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.16
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

FROM $GO_BUILDER as builder

WORKDIR /workspace
COPY . .

ENV CGO_ENABLED=1
Expand All @@ -16,6 +17,7 @@ FROM $GO_RUNTIME
ARG VERSION=knative-v1.16

COPY --from=builder /usr/bin/main /usr/bin/eventshub
COPY LICENSE /licenses/

USER 65532

Expand Down
2 changes: 1 addition & 1 deletion openshift/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ GOFLAGS='' go install github.com/openshift-knative/hack/cmd/generate@latest
$(go env GOPATH)/bin/generate \
--root-dir "${repo_root_dir}" \
--generators dockerfile \
--dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.16"
--dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.17"