Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ base_images:
name: builder
namespace: ocp
tag: rhel-8-golang-1.19-openshift-4.13
rhel-coreos-8-base:
rhel-coreos-base:
name: "4.13"
namespace: ocp
tag: rhel-coreos-8
tag: rhel-coreos
tools:
name: "4.13"
namespace: ocp
Expand Down Expand Up @@ -75,25 +75,25 @@ images:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos-8 base image
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
FROM quay.io/centos/centos:stream9 as build
# Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
# in a container https://github.com/coreos/rpm-ostree/issues/4034
RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download openshift-hyperkube
# See also https://issues.redhat.com/browse/ART-4352
FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-8
FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos
COPY --from=build /*.rpm /
# Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
inputs:
base-machine-with-rpms:
as:
- quay.io/centos/centos:stream9
rhel-coreos-8-base:
rhel-coreos-base:
as:
- registry.ci.openshift.org/rhcos-devel/rhel-coreos-8
to: rhel-coreos-8
- registry.ci.openshift.org/rhcos-devel/rhel-coreos
to: rhel-coreos
- context_dir: build/pause
dockerfile_path: Dockerfile.Rhel
from: base
Expand All @@ -107,7 +107,7 @@ promotion:
artifacts: artifacts
excluded_images:
- machine-os-content
- rhel-coreos-8
- rhel-coreos
name: "4.13"
namespace: ocp
raw_steps:
Expand Down