Skip to content

Commit

Permalink
Merge pull request #101 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.15-ose-cluster-bootstrap

OCPBUGS-24147: Updating ose-cluster-bootstrap-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Jan 4, 2024
2 parents 68b3168 + e62414b commit 0849c46
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.20-openshift-4.15
tag: rhel-9-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/github.com/openshift/cluster-bootstrap
COPY . .
ENV GO_PACKAGE github.com/openshift/cluster-bootstrap
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.Version=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/cluster-bootstrap

FROM registry.ci.openshift.org/ocp/4.15:base
FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
COPY --from=builder /go/src/github.com/openshift/cluster-bootstrap/cluster-bootstrap /
ENTRYPOINT ["/cluster-bootstrap"]
COPY manifests /manifests
Expand Down

0 comments on commit 0849c46

Please sign in to comment.