Skip to content

Commit 24b406b

Browse files
Merge pull request #6242 from vanhalenar/102-image
USHIFT-6629: Add RHEL 10.2 base images
2 parents 7b329be + a4007d0 commit 24b406b

3 files changed

Lines changed: 51 additions & 0 deletions

File tree

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM registry.stage.redhat.io/rhel10/rhel-bootc:10.2
2+
3+
# Build arguments
4+
ARG USHIFT_RPM_REPO_NAME=microshift-local
5+
ARG USHIFT_RPM_REPO_PATH=/tmp/$USHIFT_RPM_REPO_NAME
6+
7+
# Configure the RPM repositories (no EUS in staging environment)
8+
COPY --chmod=755 ./bootc-images/rpm-repo-config.sh /tmp/rpm-repo-config.sh
9+
RUN /tmp/rpm-repo-config.sh && rm -f /tmp/rpm-repo-config.sh
10+
11+
# Configure the RHEL mirror RPM repositories (for use in the staging environment)
12+
ARG RHEL_MIRROR_REPO_NAME=rhel102-mirror.repo
13+
ARG RHEL_MIRROR_REPO_PATH=/etc/yum.repos.d/$RHEL_MIRROR_REPO_NAME
14+
COPY --chmod=644 ./bootc-images/$RHEL_MIRROR_REPO_NAME $RHEL_MIRROR_REPO_PATH
15+
16+
# Copy the MicroShift repository contents
17+
COPY ./rpm-repos/$USHIFT_RPM_REPO_NAME $USHIFT_RPM_REPO_PATH
18+
19+
# Copy repository configuration
20+
COPY ./bootc-images/$USHIFT_RPM_REPO_NAME.repo /etc/yum.repos.d/
21+
22+
# Install the test agent and cleanup
23+
RUN dnf install -y microshift-test-agent && \
24+
systemctl enable microshift-test-agent && \
25+
rm -vf /etc/yum.repos.d/microshift-*.repo && \
26+
rm -rvf $USHIFT_RPM_REPO_PATH && \
27+
dnf clean all
28+
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
# TODO: Replace this by a RHEL 10.2 image when its RPM repositories are released.
3+
# Bootc Image Builder has a limitation does not allowing it to build ISO images
4+
# from containers that use repositories protected by credentials. Thus, we build
5+
# from the test agent container image which uses proxy for accessing repositories.
6+
# registry.redhat.io/rhel10/rhel-bootc:10.2
7+
localhost/rhel102-test-agent:latest
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[rhel-10.2-appstream]
2+
name = rhel-10.2-appstream
3+
4+
baseurl = http://localhost:{{ .Env.WEB_SERVER_PORT }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-102-appstream
5+
enabled = 1
6+
sslverify = false
7+
gpgcheck = 0
8+
skip_if_unavailable = false
9+
10+
[rhel-10.2-baseos]
11+
name = rhel-10.2-baseos
12+
baseurl = http://localhost:{{ .Env.WEB_SERVER_PORT }}/ocp-mirror/reposync/4.22{{ if eq .Env.UNAME_M "aarch64" }}_aarch64{{ end }}/rhel-102-baseos
13+
enabled = 1
14+
sslverify = false
15+
gpgcheck = 0
16+
skip_if_unavailable = false

0 commit comments

Comments
 (0)