Skip to content

Commit f96daca

Browse files
Merge pull request #249 from openshift-bot/art-consistency-openshift-4.11-operator-registry
Updating operator-registry images to be consistent with ART
2 parents 6858269 + fbc18d6 commit f96daca

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.ci-operator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
build_root_image:
2+
name: release
3+
namespace: openshift
4+
tag: rhel-8-release-golang-1.17-openshift-4.11
15
project_image:
26
context_dir: .
37
dockerfile_path: base.Dockerfile

operator-registry.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder
22

33
ENV GOPATH /go
44
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
@@ -11,7 +11,7 @@ RUN make build/registry cross
1111
# copy and build vendored grpc_health_probe
1212
RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/...
1313

14-
FROM registry.ci.openshift.org/ocp/4.10:base
14+
FROM registry.ci.openshift.org/ocp/4.11:base
1515

1616
COPY --from=builder /src/bin/* /bin/registry/
1717
COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe

0 commit comments

Comments
 (0)