Skip to content

Commit

Permalink
Update ocp/builder ci/release builder images to openshift/release
Browse files Browse the repository at this point in the history
  • Loading branch information
maxcao13 committed Jul 23, 2024
1 parent f25ceaf commit 3f44f38
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 AS builder
WORKDIR /go/src/github.com/openshift/vertical-pod-autoscaler-operator
COPY . .
ENV NO_DOCKER=1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 AS builder
WORKDIR /go/src/github.com/openshift/vertical-pod-autoscaler-operator
COPY . .
ENV NO_DOCKER=1
Expand Down
4 changes: 2 additions & 2 deletions images/ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 AS builder

WORKDIR /go/src/github.com/openshift/vertical-pod-autoscaler-operator

COPY . .

RUN make build

FROM registry.ci.openshift.org/openshift/origin-v4.0:base
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9

COPY --from=builder /go/src/github.com/openshift/vertical-pod-autoscaler-operator/bin/vertical-pod-autoscaler-operator /usr/bin/

2 changes: 1 addition & 1 deletion images/operator-registry/Dockerfile.registry.ci
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM quay.io/operator-framework/upstream-registry-builder:v1.30.1 as registry-bu
# We only need the binaries from this image.


FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS operator-builder
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 AS operator-builder
WORKDIR /
COPY hack/ /scripts
COPY manifests/ /manifests
Expand Down

0 comments on commit 3f44f38

Please sign in to comment.