Skip to content

Commit 2fa25ec

Browse files
Merge pull request #433 from awgreene/fix-art-consistency
OCPBUGS-6241: Fix art consistency
2 parents 932e3a0 + f6296fa commit 2fa25ec

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.19-openshift-4.12
4+
tag: rhel-8-release-golang-1.19-openshift-4.13

operator-lifecycle-manager.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.19-openshift-4.12 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 AS builder
22

33
ENV GO111MODULE auto
44
ENV GOPATH /go
@@ -14,7 +14,7 @@ RUN mkdir -p .git/objects
1414
COPY . .
1515
RUN make build/olm bin/cpb
1616

17-
FROM registry.ci.openshift.org/ocp/4.12:base
17+
FROM registry.ci.openshift.org/ocp/4.13:base
1818

1919
ADD manifests/ /manifests
2020
LABEL io.openshift.release.operator=true

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.18-openshift-4.12 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 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.12:base
14+
FROM registry.ci.openshift.org/ocp/4.13: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)