Skip to content

Commit

Permalink
Merge pull request #934 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.10-openshift-enterprise-hyperkube

Updating openshift-enterprise-hyperkube images to be consistent with ART
  • Loading branch information
openshift-merge-robot authored Nov 24, 2021
2 parents fedcee3 + 4341263 commit bac83a5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions openshift-hack/images/hyperkube/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
WORKDIR /go/src/k8s.io/kubernetes
COPY . .
RUN make WHAT='cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler cmd/kubelet cmd/watch-termination' && \
Expand All @@ -7,7 +7,7 @@ RUN make WHAT='cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler
cp /go/src/k8s.io/kubernetes/_output/local/bin/linux/$(go env GOARCH)/{kube-apiserver,kube-controller-manager,kube-scheduler,kubelet,watch-termination} \
/tmp/build

FROM registry.ci.openshift.org/ocp/4.9:base
FROM registry.ci.openshift.org/ocp/4.10:base
RUN yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False iproute && yum clean all
COPY --from=builder /tmp/build/* /usr/bin/
LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \
Expand Down

0 comments on commit bac83a5

Please sign in to comment.