Skip to content

Commit

Permalink
Merge pull request #94 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….15-atomic-openshift-descheduler

OCPBUGS-18845: Updating atomic-openshift-descheduler images to be consistent with ART
  • Loading branch information
openshift-merge-robot authored Sep 20, 2023
2 parents 0fb0646 + 89d5cb0 commit 6721d70
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.20-openshift-4.14
tag: rhel-8-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions images/descheduler/Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/sigs.k8s.io/descheduler
COPY . .
ARG prefix=sigs.k8s.io/descheduler/pkg/version
RUN go build -ldflags "-X ${prefix}.version=${OS_GIT_VERSION} -X ${prefix}.buildDate=${BUILD_RELEASE} -X ${prefix}.gitsha1=${SOURCE_GIT_COMMIT}" -o descheduler ./cmd/descheduler

FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.14
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.15
COPY --from=builder /go/src/sigs.k8s.io/descheduler/descheduler /usr/bin/
CMD ["/usr/bin/descheduler"]

0 comments on commit 6721d70

Please sign in to comment.