particle-os/debian-koji-osbuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove rhel.repo to avoid dnf being confused

Browse source 
when building the containers the initial `dnf upgrade` will download
content from the latest nightly trees which turns the container into a
Beta system and subsequent `dnf isntall` gets confused!
This commit is contained in:
Alexander Todorov 2021-07-27 11:19:45 +03:00 • committed by Ondřej Budai
parent 3f54467fd4
commit e778771f2b
4 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
koji-osbuild.spec
View file

@ -85,7 +85,6 @@ install -m 0755 -vp test/data/* %{buildroot}/%{_
install -m 0755 -vd %{buildroot}/%{_datadir}/%{name}-tests/container install -m 0755 -vd %{buildroot}/%{_datadir}/%{name}-tests/container
install -m 0755 -vp test/container/brew.repo %{buildroot}/%{_datadir}/%{name}-tests/container/ install -m 0755 -vp test/container/brew.repo %{buildroot}/%{_datadir}/%{name}-tests/container/
install -m 0755 -vp test/container/rhel.repo %{buildroot}/%{_datadir}/%{name}-tests/container/
install -m 0755 -vd %{buildroot}/%{_datadir}/%{name}-tests/container/builder install -m 0755 -vd %{buildroot}/%{_datadir}/%{name}-tests/container/builder
install -m 0755 -vp test/container/builder/Dockerfile.fedora %{buildroot}/%{_datadir}/%{name}-tests/container/builder/ install -m 0755 -vp test/container/builder/Dockerfile.fedora %{buildroot}/%{_datadir}/%{name}-tests/container/builder/

1
test/container/builder/Dockerfile.rhel
View file

@ -2,7 +2,6 @@ ARG version=latest
FROM registry.access.redhat.com/ubi8/ubi:$version FROM registry.access.redhat.com/ubi8/ubi:$version
COPY container/rhel.repo /etc/yum.repos.d/
COPY container/brew.repo /etc/yum.repos.d/ COPY container/brew.repo /etc/yum.repos.d/
RUN dnf -y upgrade \ RUN dnf -y upgrade \

1
test/container/hub/Dockerfile.rhel
View file

@ -2,7 +2,6 @@ ARG version=latest
FROM registry.access.redhat.com/ubi8/ubi:$version FROM registry.access.redhat.com/ubi8/ubi:$version
COPY container/rhel.repo /etc/yum.repos.d/
COPY container/brew.repo /etc/yum.repos.d/ COPY container/brew.repo /etc/yum.repos.d/
# koji db schema is in docs, remove nodocs from from dnf config # koji db schema is in docs, remove nodocs from from dnf config

11
test/container/rhel.repo
View file

@ -1,11 +0,0 @@
[RHEL-8-BaseOS]
name=baseos
baseurl=http://download.devel.redhat.com/rhel-8/rel-eng/RHEL-8/latest-RHEL-8/compose/BaseOS/x86_64/os/
enabled=1
gpgcheck=0
[RHEL-8-AppStream]
name=appstream
baseurl=http://download.devel.redhat.com/rhel-8/rel-eng/RHEL-8/latest-RHEL-8/compose/AppStream/x86_64/os/
enabled=1
gpgcheck=0